Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Unified Diff: cros_mark_as_stable.py

Issue 3159010: Don't throw an error if not on stabilizing branch and give more information on exit. (Closed) Base URL: http://src.chromium.org/git/crosutils.git
Patch Set: petkov Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cros_mark_as_stable.py
diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py
index 6daf9bb6972ac90acf79c01e1d940400b275d5fb..eff1bda02356e219b25e44e155310b7b51e3c0e1 100755
--- a/cros_mark_as_stable.py
+++ b/cros_mark_as_stable.py
@@ -126,8 +126,10 @@ def _PushChange():
# Sanity check to make sure we're on a stabilizing branch before pushing.
if not _CheckOnStabilizingBranch():
- generate_test_report.Die('Expected %s to be on branch "%s"' %
- (os.getcwd(), _STABLE_BRANCH_NAME))
+ print 'Not on branch %s so no work found to push. Exiting' % \
+ _STABLE_BRANCH_NAME
+ return
+
description = _RunCommand('git log --format=format:%s%n%n%b ' +
gflags.FLAGS.tracking_branch + '..')
description = 'Marking set of ebuilds as stable\n\n%s' % description
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698