summaryrefslogtreecommitdiffstats
path: root/pym/portage/dbapi/vartree.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
-rw-r--r--pym/portage/dbapi/vartree.py68
1 files changed, 34 insertions, 34 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 284d5ff1f..45686ee00 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -80,10 +80,10 @@ class PreservedLibsRegistry(object):
self._data = pickle.load(
open(_unicode_encode(self._filename,
encoding=_encodings['fs'], errors='strict'), 'rb'))
- except (ValueError, pickle.UnpicklingError), e:
+ except (ValueError, pickle.UnpicklingError) as e:
writemsg_level(_("!!! Error loading '%s': %s\n") % \
(self._filename, e), level=logging.ERROR, noiselevel=-1)
- except (EOFError, IOError), e:
+ except (EOFError, IOError) as e:
if isinstance(e, EOFError) or e.errno == errno.ENOENT:
pass
elif e.errno == PermissionDenied.errno:
@@ -104,7 +104,7 @@ class PreservedLibsRegistry(object):
f = atomic_ofstream(self._filename, 'wb')
pickle.dump(self._data, f, protocol=2)
f.close()
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != PermissionDenied.errno:
writemsg("!!! %s %s\n" % (e, self._filename), noiselevel=-1)
else:
@@ -335,7 +335,7 @@ class LinkageMap(object):
for x in items)
try:
proc = subprocess.Popen(args, stdout=subprocess.PIPE)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
raise CommandNotFound(args[0])
@@ -907,7 +907,7 @@ class vardbapi(dbapi):
try:
os.rename(os.path.join(newpath, old_pf + ".ebuild"),
os.path.join(newpath, new_pf + ".ebuild"))
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -931,7 +931,7 @@ class vardbapi(dbapi):
cat_dir = self.getpath(mysplit[0])
try:
dir_list = os.listdir(cat_dir)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno == PermissionDenied.errno:
raise PermissionDenied(cat_dir)
del e
@@ -972,7 +972,7 @@ class vardbapi(dbapi):
try:
return [x for x in os.listdir(p) \
if os.path.isdir(os.path.join(p, x))]
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno == PermissionDenied.errno:
raise PermissionDenied(p)
del e
@@ -1097,7 +1097,7 @@ class vardbapi(dbapi):
f.close()
apply_secpass_permissions(
self._aux_cache_filename, gid=portage_gid, mode=0644)
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
pass
self._aux_cache["modified"] = set()
@@ -1129,7 +1129,7 @@ class vardbapi(dbapi):
aux_cache = mypickle.load()
f.close()
del f
- except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError), e:
+ except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError) as e:
if isinstance(e, pickle.UnpicklingError):
writemsg(_("!!! Error loading '%s': %s\n") % \
(self._aux_cache_filename, str(e)), noiselevel=-1)
@@ -1193,7 +1193,7 @@ class vardbapi(dbapi):
mydir_stat = None
try:
mydir_stat = os.stat(mydir)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
raise KeyError(mycpv)
@@ -1251,7 +1251,7 @@ class vardbapi(dbapi):
if st is None:
try:
st = os.stat(mydir)
- except OSError, e:
+ except OSError as e:
if e.errno == errno.ENOENT:
raise KeyError(mycpv)
elif e.errno == PermissionDenied.errno:
@@ -1343,7 +1343,7 @@ class vardbapi(dbapi):
encoding=_encodings['fs'], errors='strict'),
mode='r', encoding=_encodings['repo.content'],
errors='replace')
- except EnvironmentError, e:
+ except EnvironmentError as e:
new_vdb = not bool(self.cpv_all())
if not new_vdb:
writemsg(_("!!! Unable to read COUNTER file: '%s'\n") % \
@@ -1356,7 +1356,7 @@ class vardbapi(dbapi):
counter = long(cfile.readline().strip())
finally:
cfile.close()
- except (OverflowError, ValueError), e:
+ except (OverflowError, ValueError) as e:
writemsg(_("!!! COUNTER file is corrupt: '%s'\n") % \
self._counter_path, noiselevel=-1)
writemsg("!!! %s\n" % str(e), noiselevel=-1)
@@ -1674,9 +1674,9 @@ class vartree(object):
mys = myprovide.split("/")
myprovides += [mys[0] + "/" + mys[1]]
return myprovides
- except SystemExit, e:
+ except SystemExit as e:
raise
- except Exception, e:
+ except Exception as e:
mydir = os.path.join(self.root, VDB_PATH, mycpv)
writemsg(_("\nParse Error reading PROVIDE and USE in '%s'\n") % mydir,
noiselevel=-1)
@@ -1931,7 +1931,7 @@ class dblink(object):
encoding=_encodings['fs'], errors='strict'),
mode='r', encoding=_encodings['repo.content'],
errors='replace')
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -2089,7 +2089,7 @@ class dblink(object):
try:
doebuild_environment(myebuildpath, "prerm", self.myroot,
self.settings, 0, 0, self.vartree.dbapi)
- except UnsupportedAPIException, e:
+ except UnsupportedAPIException as e:
# Sometimes this happens due to corruption of the EAPI file.
writemsg(_("!!! FAILED prerm: %s\n") % \
os.path.join(self.dbdir, "EAPI"), noiselevel=-1)
@@ -2249,7 +2249,7 @@ class dblink(object):
if catdir_lock:
try:
os.rmdir(catdir)
- except OSError, e:
+ except OSError as e:
if e.errno not in (errno.ENOENT,
errno.ENOTEMPTY, errno.EEXIST):
raise
@@ -2468,7 +2468,7 @@ class dblink(object):
not self.isprotected(obj):
try:
unlink(obj, lstatobj)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno not in ignored_unlink_errnos:
raise
del e
@@ -2499,7 +2499,7 @@ class dblink(object):
try:
unlink(obj, lstatobj)
show_unmerge("<<<", "", file_type, obj)
- except (OSError, IOError),e:
+ except (OSError, IOError) as e:
if e.errno not in ignored_unlink_errnos:
raise
del e
@@ -2511,7 +2511,7 @@ class dblink(object):
mymd5 = None
try:
mymd5 = perf_md5(obj, calc_prelink=1)
- except FileNotFound, e:
+ except FileNotFound as e:
# the file has disappeared between now and our stat call
show_unmerge("---", unmerge_desc["!obj"], file_type, obj)
continue
@@ -2523,7 +2523,7 @@ class dblink(object):
continue
try:
unlink(obj, lstatobj)
- except (OSError, IOError), e:
+ except (OSError, IOError) as e:
if e.errno not in ignored_unlink_errnos:
raise
del e
@@ -2558,7 +2558,7 @@ class dblink(object):
# Restore the parent flags we saved before unlinking
bsd_chflags.chflags(parent_name, pflags)
show_unmerge("<<<", "", "dir", obj)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno not in ignored_rmdir_errnos:
raise
if e.errno != errno.ENOENT:
@@ -2678,7 +2678,7 @@ class dblink(object):
parent_path = os_filename_arg.path.dirname(destfile)
try:
parent_stat = os_filename_arg.stat(parent_path)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -2742,7 +2742,7 @@ class dblink(object):
return
try:
self.vartree.dbapi.linkmap.rebuild(**kwargs)
- except CommandNotFound, e:
+ except CommandNotFound as e:
self._linkmap_broken = True
self._display_merge(_("!!! Disabling preserve-libs " \
"due to error: Command Not Found: %s\n") % (e,),
@@ -3038,7 +3038,7 @@ class dblink(object):
obj_type = _("obj")
try:
os.unlink(obj)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -3101,7 +3101,7 @@ class dblink(object):
os.path.join(destroot, f.lstrip(os.path.sep)))
try:
dest_lstat = os.lstat(dest_path)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno == errno.ENOENT:
del e
continue
@@ -3116,7 +3116,7 @@ class dblink(object):
try:
dest_lstat = os.lstat(parent_path)
break
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOTDIR:
raise
del e
@@ -3185,7 +3185,7 @@ class dblink(object):
path = os.path.join(root, f.lstrip(os.sep))
try:
st = os.lstat(path)
- except OSError, e:
+ except OSError as e:
if e.errno not in (errno.ENOENT, errno.ENOTDIR):
raise
del e
@@ -3236,7 +3236,7 @@ class dblink(object):
try:
s = os.lstat(path)
- except OSError, e:
+ except OSError as e:
if e.errno not in (errno.ENOENT, errno.ENOTDIR):
raise
del e
@@ -3360,7 +3360,7 @@ class dblink(object):
encoding=_encodings['fs'], errors='strict'),
mode='r', encoding=_encodings['repo.content'],
errors='replace').readline().strip()
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -3669,7 +3669,7 @@ class dblink(object):
try:
os.unlink(os.path.join(
os.path.dirname(normalize_path(srcroot)), ".installed"))
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -4006,7 +4006,7 @@ class dblink(object):
try:
mydstat = os.lstat(mydest)
mydmode = mydstat.st_mode
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
del e
@@ -4420,7 +4420,7 @@ def tar_contents(contents, root, tar, protect=None, onProgress=None):
curval += 1
try:
lst = os.lstat(path)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
del e
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-02 23:39:34 +0000