From cfac7bcb2079b463e33c2401002575d0de12d9b2 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Thu, 23 Apr 2009 13:01:35 -0400 Subject: When catching an OSError, handle it as an object instead of a tuple (#497374). --- livecd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'livecd.py') diff --git a/livecd.py b/livecd.py index 915c0c178..280434b10 100644 --- a/livecd.py +++ b/livecd.py @@ -90,8 +90,8 @@ def copytree(src, dst, symlinks=False, preserveOwner=False, if preserveSelinux: selinux.lsetfilecon(dst, selinux.lgetfilecon(src)[1]) shutil.copystat(src, dst) - except OSError, why: - errors.extend((src, dst, str(why))) + except OSError as e: + errors.extend((src, dst, e.strerror)) if errors: raise Error, errors @@ -299,7 +299,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): try: os.rmdir("%s/mnt/%s" %(anaconda.rootPath, e.format.mountpoint)) - except OSError, e: + except OSError as e: log.debug("error removing %s" %(tocopy,)) for e in [entry] + fsdict[tocopy]: e.format.setup(chroot=anaconda.rootPath) -- cgit