[Fedora-livecd-list] imgcreate/creator.py imgcreate/debug.py imgcreate/fs.py imgcreate/kickstart.py

imgcreate/creator.py | 8 ++++---- imgcreate/debug.py | 4 ++-- imgcreate/fs.py | 4 ++-- imgcreate/kickstart.py | 10 ++++++---- 4 files changed, 14 insertions(+), 12 deletions(-) New commits: commit 341ee165662be870c09acaba36fc71684ad0a788 Author: Bruno Wolff III <bruno(a)wolff.to&gt; Date: Sun Jul 25 09:09:44 2010 -0500 Fix issue with improper exception args used by urlgrabber and pykickstart. urlgrabber and pykickstart don't always supply both and error number and an error message when raising an IOError exception. This was causing an exception while processing the exception for some errors. To prevent exceptions from insufficient arguments, the exception calls were changed to use a single variable instead of a tuple and to use strerror instead of the second argument. As a temporary work around for urlgrabber and pykickstart issues, if strerror is null, args[0] is used as a fallback so that we get a reasonable error message. This resolves bug 551932. diff --git a/imgcreate/creator.py b/imgcreate/creator.py index 4deb49e..0ba5af5 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -385,9 +385,9 @@ class ImageCreator(object): try: self.__builddir = tempfile.mkdtemp(dir = os.path.abspath(self.tmpdir), prefix = "imgcreate-") - except OSError, (err, msg): + except OSError, e: raise CreatorError("Failed create build directory in %s: %s" % - (self.tmpdir, msg)) + (self.tmpdir, e.strerror)) def __sanity_check(self): """Ensure that the config we've been given is sane.""" @@ -705,9 +705,9 @@ class ImageCreator(object): try: subprocess.check_call([s.interp, script], preexec_fn = preexec, env = env) - except OSError, (err, msg): + except OSError, e: raise CreatorError("Failed to execute %%post script " - "with '%s' : %s" % (s.interp, msg)) + "with '%s' : %s" % (s.interp, e.strerror)) except subprocess.CalledProcessError, err: if s.errorOnFail: raise CreatorError("%%post script failed with code %d " diff --git a/imgcreate/debug.py b/imgcreate/debug.py index c45047d..84b8d30 100644 --- a/imgcreate/debug.py +++ b/imgcreate/debug.py @@ -30,9 +30,9 @@ def handle_logging(option, opt, val, parser, logger, level): def handle_logfile(option, opt, val, parser, logger, stream): try: logfile = logging.FileHandler(val,"a") - except IOError, (err, msg): + except IOError, e: raise optparse.OptionValueError("Cannot open file '%s' : %s" % - (val, msg)) + (val, e.strerror)) logger.removeHandler(stream) diff --git a/imgcreate/fs.py b/imgcreate/fs.py index 16445a5..c5cd18b 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -36,8 +36,8 @@ def makedirs(dirname): """ try: os.makedirs(dirname) - except OSError, (err, msg): - if err != errno.EEXIST: + except OSError, e: + if e.errno != errno.EEXIST: raise def mksquashfs(in_img, out_img, compress_type): diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 328043c..6600fd7 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -53,9 +53,11 @@ def read_kickstart(path): try: ksfile = urlgrabber.urlgrab(path) ks.readKickstart(ksfile) - except IOError, (err, msg): +# Fallback to e.args[0] is a workaround for bugs in urlgragger and pykickstart. + except IOError, e: raise errors.KickstartError("Failed to read kickstart file " - "'%s' : %s" % (path, msg)) + "'%s' : %s" % (path, e.strerror or + e.args[0])) except kserrors.KickstartError, e: raise errors.KickstartError("Failed to parse kickstart file " "'%s' : %s" % (path, e)) @@ -153,8 +155,8 @@ class TimezoneConfig(KickstartConfig): try: shutil.copyfile(self.path("/usr/share/zoneinfo/%s" %(tz,)), self.path("/etc/localtime")) - except OSError, (errno, msg): - log.error("Error copying timezone: %s" %(msg,)) + except OSError, e: + log.error("Error copying timezone: %s" %(e.strerror,)) class AuthConfig(KickstartConfig):