Bug #293998 - Use OSError.errno instead of trying to subscript the exception
authorZac Medico <zmedico@gentoo.org>
Wed, 25 Nov 2009 22:31:51 +0000 (22:31 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 25 Nov 2009 22:31:51 +0000 (22:31 -0000)
when handling errno.EXDEV in movefile(), since exceptions do not support
subscripting in python3. (trunk r14873)

svn path=/main/branches/2.1.7/; revision=14887

pym/portage/__init__.py

index 514e1f46d68d2ce57e42540775b9d5068a63b2f7..25ef6fb3f890a503dc8b02025452b889d1007a4d 100644 (file)
@@ -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)