summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer4
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):
190 err = os.tmpfile() 190 err = os.tmpfile()
191 try: 191 try:
192 subprocess.check_call(cmd, stdout=out, stderr=err, cwd=destdir, shell=isinstance(cmd, str), env=env or os.environ) 192 subprocess.check_call(cmd, stdout=out, stderr=err, cwd=destdir, shell=isinstance(cmd, str), env=env or os.environ)
193 except subprocess.CalledProcessError,e: 193 except subprocess.CalledProcessError as e:
194 err.seek(0) 194 err.seek(0)
195 if printerr: 195 if printerr:
196 logger.error("%s" % err.read()) 196 logger.error("%s" % err.read())
@@ -429,7 +429,7 @@ file_exclude = %s''' % (name, file_filter or '<empty>', repo.get('file_exclude',
429 runcmd('git replace --graft %s %s' % (start, startrev)) 429 runcmd('git replace --graft %s %s' % (start, startrev))
430 try: 430 try:
431 runcmd(merge) 431 runcmd(merge)
432 except Exception, error: 432 except Exception as error:
433 logger.info('''Merging component repository history failed, perhaps because of merge conflicts. 433 logger.info('''Merging component repository history failed, perhaps because of merge conflicts.
434It may be possible to commit anyway after resolving these conflicts. 434It may be possible to commit anyway after resolving these conflicts.
435 435