From 438eabc248f272e3d272aecaa4c9cec177b172d5 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 2 Jun 2016 13:12:48 +0300 Subject: scripts: python3: use new style except statement Changed old syle except statements 'except , var' to new style 'except as var' as old style is not supported in python3. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/combo-layer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/combo-layer') 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 '', 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. -- cgit 1.2.3-korg