britney

Merge lp:~cjwatson/britney/fix-sru-branching into lp:~ubuntu-release/britney/britney1-ubuntu

  1. fix-sru-branching
  2. Merge into britney1-ubuntu
Proposed by Colin Watson
Status: Merged
Merged at revision: 281
Proposed branch: lp:~cjwatson/britney/fix-sru-branching
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 54 lines (+21/-15)
1 file modified
britney (+21/-15)
To merge this branch: bzr merge lp:~cjwatson/britney/fix-sru-branching
Reviewer Review Type Date Requested Status
Ubuntu Package Archive Administrators Pending
Review via email: mp+261538@code.launchpad.net

This proposal supersedes a proposal from 2015-06-09.

Commit message

Make sure the hints branch always points to the right place, even if it's changed due to e.g. a series being released.

Description of the change

Make sure the hints branch always points to the right place, even if it's changed due to e.g. a series being released.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'britney'
--- britney 2015-05-05 01:38:20 +0000
+++ britney 2015-06-09 16:35:13 +0000
@@ -307,29 +307,35 @@
307 lite_sync $DATA_B2 $DATA307 lite_sync $DATA_B2 $DATA
308fi308fi
309309
310make_hints_branch () {
311 if [ -d "$2" ]; then
312 bzr pull -q -d "$2" --remember --overwrite "$1"
313 else
314 bzr branch "$1" "$2"
315 fi
316}
317
310if option hints_bzr; then318if option hints_bzr; then
311 echo HINTS_BZR:319 echo HINTS_BZR:
312 if [ "$DISTRIBUTION" = ubuntu ]; then320 if [ "$DISTRIBUTION" = ubuntu ]; then
313 if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then321 if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
314 bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints322 branch="lp:~ubuntu-release/britney/hints-ubuntu"
315 elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
316 bzr branch lp:~ubuntu-release/britney/hints-ubuntu $DATA_B2/$SERIES-proposed/Hints
317 else323 else
318 bzr branch lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES $DATA_B2/$SERIES-proposed/Hints324 branch="lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES"
319 fi325 fi
320 if [ -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch ]; then326 make_hints_branch "$DATA_B2/$SERIES-proposed/Hints" "$branch"
321 bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch327 if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
322 elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then328 make_hints_branch \
323 bzr branch lp:~ubuntu-touch-release/britney/hints-ubuntu-touch $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch329 "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch" \
330 "lp:~ubuntu-touch-release/britney/hints-ubuntu-touch"
331 else
332 rm -rf "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch"
324 fi333 fi
325 elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then334 elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then
326 if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then335 make_hints_branch \
327 bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints336 "$DATA_B2/$SERIES-proposed/Hints" \
328 else337 lp:~ubuntu-release/britney/hints-ubuntu-rtm
329 bzr branch lp:~ubuntu-release/britney/hints-ubuntu-rtm $DATA_B2/$SERIES-proposed/Hints
330 fi
331 fi338 fi
332 # TODO do something for RTM
333fi339fi
334340
335run_b1 () {341run_b1 () {

Subscribers

People subscribed via source and target branches