wic: use new syntax of 'except' statement
New syntax 'except Exception as err' is supported by Python >= 2.7. Old syntax 'except Exception, err' is not supported by Python 3. Used new syntax to be able to run wic on Python 3. [YOCTO #9412] (From OE-Core rev: 15e88714d6b0a93f72e8a19b083fcc1f2006e128) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ed10a80c2c
commit
e301be3cd0
|
@ -395,6 +395,6 @@ class DirectImageCreator(BaseImageCreator):
|
|||
if not self.__image is None:
|
||||
try:
|
||||
self.__image.cleanup()
|
||||
except ImageError, err:
|
||||
except ImageError as err:
|
||||
msger.warning("%s" % err)
|
||||
|
||||
|
|
|
@ -97,7 +97,7 @@ class PluginMgr():
|
|||
self.plugin_dirs[pdir] = True
|
||||
msger.debug("Plugin module %s:%s imported"\
|
||||
% (mod, pymod.__file__))
|
||||
except ImportError, err:
|
||||
except ImportError as err:
|
||||
msg = 'Failed to load plugin %s/%s: %s' \
|
||||
% (os.path.basename(pdir), mod, err)
|
||||
msger.warning(msg)
|
||||
|
|
|
@ -67,7 +67,7 @@ def runtool(cmdln_or_args, catch=1):
|
|||
(sout, serr) = process.communicate()
|
||||
# combine stdout and stderr, filter None out
|
||||
out = ''.join(filter(None, [sout, serr]))
|
||||
except OSError, err:
|
||||
except OSError as err:
|
||||
if err.errno == 2:
|
||||
# [Errno 2] No such file or directory
|
||||
msger.error('Cannot run command: %s, lost dependency?' % cmd)
|
||||
|
|
Loading…
Reference in New Issue