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 1ca2ce6c02..e47059290d 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -519,7 +519,7 @@ def check_patch(patchfile):
519 519
520def drop_to_shell(workdir=None): 520def drop_to_shell(workdir=None):
521 if not sys.stdin.isatty(): 521 if not sys.stdin.isatty():
522 print "Not a TTY so can't drop to shell for resolution, exiting." 522 print("Not a TTY so can't drop to shell for resolution, exiting.")
523 return False 523 return False
524 524
525 shell = os.environ.get('SHELL', 'bash') 525 shell = os.environ.get('SHELL', 'bash')
@@ -529,7 +529,7 @@ def drop_to_shell(workdir=None):
529 ' exit 1 -- abort\n' % shell); 529 ' exit 1 -- abort\n' % shell);
530 ret = subprocess.call([shell], cwd=workdir) 530 ret = subprocess.call([shell], cwd=workdir)
531 if ret != 0: 531 if ret != 0:
532 print "Aborting" 532 print("Aborting")
533 return False 533 return False
534 else: 534 else:
535 return True 535 return True