diff --git a/subcmds/download.py b/subcmds/download.py index f746bc2..fbd302a 100644 --- a/subcmds/download.py +++ b/subcmds/download.py @@ -93,7 +93,7 @@ If no project is specified try to use current directory as a project. continue if len(dl.commits) > 1: - print('[%s] %d/%d depends on %d unmerged changes:' \ + print('[%s] %d/%d depends on %d unmerged changes:' % (project.name, change_id, ps_id, len(dl.commits)), file=sys.stderr) for c in dl.commits: @@ -102,7 +102,7 @@ If no project is specified try to use current directory as a project. try: project._CherryPick(dl.commit) except GitError: - print('[%s] Could not complete the cherry-pick of %s' \ + print('[%s] Could not complete the cherry-pick of %s' % (project.name, dl.commit), file=sys.stderr) sys.exit(1) diff --git a/subcmds/sync.py b/subcmds/sync.py index 54b5a7f..df23034 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -355,7 +355,7 @@ later is required to fix a server side protocol bug. except _FetchError: pass except Exception as e: - print('error: Cannot fetch %s (%s: %s)' \ + print('error: Cannot fetch %s (%s: %s)' % (project.name, type(e).__name__, str(e)), file=sys.stderr) err_event.set() raise diff --git a/subcmds/upload.py b/subcmds/upload.py index f81491a..c0f870e 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -422,8 +422,8 @@ Gerrit Code Review: https://www.gerritcodereview.com/ else: fmt = '\n (%s)' print(('[FAILED] %-15s %-15s' + fmt) % ( - branch.project.relpath + '/', \ - branch.name, \ + branch.project.relpath + '/', + branch.name, str(branch.error)), file=sys.stderr) print()