From 93b66c3ef76d69f6b2696822d38ac2b46faa8c01 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 25 Nov 2009 22:31:51 +0000 Subject: 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. (trunk r14873) svn path=/main/branches/2.1.7/; revision=14887 --- pym/portage/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 514e1f46d..25ef6fb3f 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) -- cgit v1.2.3-1-g7c22