Don't backtrace when current branch is not uploadable.
The backtrace currently occurs when one uses the "--cbr" argument with
the repo upload subcommand if the current branch is not tracking an
upstream branch. There may be other cases that would backtrace as well,
but this is the only one I found so far.
Change-Id: Ie712fbb0ce3e7fe3b72769fca89cc4c0e3d2fce0
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 7f7585a..c809107 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -422,7 +422,16 @@
for project in project_list:
if opt.current_branch:
cbr = project.CurrentBranch
- avail = [project.GetUploadableBranch(cbr)] if cbr else None
+ up_branch = project.GetUploadableBranch(cbr)
+ if up_branch:
+ avail = [up_branch]
+ else:
+ avail = None
+ print('ERROR: Current branch (%s) not uploadable. '
+ 'You may be able to type '
+ '"git branch --set-upstream-to m/master" to fix '
+ 'your branch.' % str(cbr),
+ file=sys.stderr)
else:
avail = project.GetUploadableBranches(branch)
if avail: