Launchpad itself

Merge lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/launchpad/fixes-bug-402187 into lp:launchpad

  1. fixes-bug-402187
  2. Merge into devel
Proposed by No
Status: Merged
Merged at revision: not available
Proposed branch: lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/launchpad/fixes-bug-402187
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/launchpad/fixes-bug-402187
Reviewer Review Type Date Requested Status
Celso Providelo (community) code Approve
Review via email: mp+11137@code.launchpad.net
To post a comment you must log in.
Revision history for this message
No (11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount) wrote :

Fixes: bug 402187: rocketfuel-setup can't resume if fails to complete

Revision history for this message
Celso Providelo (cprov) wrote :

Hi Simon,

Thanks for fixing this problem and for your first contribution to LP, appreciated.

As we discussed on IRC, "broken devel-branch" seems to be the only case that is not correctly handled in rf-setup, all the other possible interrupted scenarios are good.

r=me

(I will land it in your behalf)

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/rocketfuel-setup'
2--- utilities/rocketfuel-setup 2009-08-13 15:12:16 +0000
3+++ utilities/rocketfuel-setup 2009-09-03 15:03:52 +0000
4@@ -372,6 +372,12 @@
5 fi
6
7 cd $LP_TRUNK_NAME
8+bzr st -q
9+if [ $? -ne 0 ]; then
10+ echo "ERROR: Your trunk branch in $LP_TRUNK_PATH is corrupted.
11+ Please delete $LP_TRUNK_PATH and run rocketfuel-setup again."
12+ exit 1
13+fi
14 if [ ! `bzr info | grep -i "parent branch" | cut -d: -f3` = \
15 "//bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/" ]; then
16 echo "ERROR: Your trunk branch in $LP_TRUNK_PATH has an