diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-11-22 01:58:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-22 01:58:05 +0000 |
| commit | c288717b899043fbea62c3f743e5d56d6751d1e6 (patch) | |
| tree | 693332ff828baa0667ef99e2f58da97c9011dc8e | |
| parent | Optimized the code for bug #288083 and make it handle more cases. Now Package (diff) | |
| download | portage-multirepo-c288717b899043fbea62c3f743e5d56d6751d1e6.tar.gz portage-multirepo-c288717b899043fbea62c3f743e5d56d6751d1e6.tar.bz2 portage-multirepo-c288717b899043fbea62c3f743e5d56d6751d1e6.zip | |
Bug #293998 - Use OSError.errno instead of trying to subscript the exception
when handling errno.EXDEV in movefile(), since exceptions do not support
subscripting in python3.
svn path=/main/trunk/; revision=14873
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4b6f841d..2641472e 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7512,10 +7512,8 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, else: ret=os.rename(src,dest) renamefailed=0 - except SystemExit as e: - raise - except Exception as e: - if e[0]!=errno.EXDEV: + except OSError as e: + if e.errno != errno.EXDEV: # Some random error. print(_("!!! Failed to move %(src)s to %(dest)s") % {"src": src, "dest": dest}) print("!!!",e) |