diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:12:48 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:28 +0100 |
| commit | ee31bad7627a7c8590a5a7dd3ffc210872067f44 (patch) | |
| tree | c40c6171e80ec97e1553620e84c2b6d289ae43ab /scripts/combo-layer | |
| parent | 07c97db27288cf806900b13e55fe37e4bf22e889 (diff) | |
| download | openembedded-core-contrib-ee31bad7627a7c8590a5a7dd3ffc210872067f44.tar.gz | |
scripts: python3: use new style except statement
Changed old syle except statements 'except <exception>, var'
to new style 'except <exception> as var' as old style is not
supported in python3.
(From OE-Core rev: 438eabc248f272e3d272aecaa4c9cec177b172d5)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 7c41f92744..0644cdc073 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -190,7 +190,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): err = os.tmpfile() try: subprocess.check_call(cmd, stdout=out, stderr=err, cwd=destdir, shell=isinstance(cmd, str), env=env or os.environ) - except subprocess.CalledProcessError,e: + except subprocess.CalledProcessError as e: err.seek(0) if printerr: logger.error("%s" % err.read()) @@ -429,7 +429,7 @@ file_exclude = %s''' % (name, file_filter or '<empty>', repo.get('file_exclude', runcmd('git replace --graft %s %s' % (start, startrev)) try: runcmd(merge) - except Exception, error: + except Exception as error: logger.info('''Merging component repository history failed, perhaps because of merge conflicts. It may be possible to commit anyway after resolving these conflicts. |