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 on 2015-06-09
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 2015-06-09 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
1=== modified file 'britney'
2--- britney 2015-05-05 01:38:20 +0000
3+++ britney 2015-06-09 16:35:13 +0000
4@@ -307,29 +307,35 @@
5 lite_sync $DATA_B2 $DATA
6 fi
7
8+make_hints_branch () {
9+ if [ -d "$2" ]; then
10+ bzr pull -q -d "$2" --remember --overwrite "$1"
11+ else
12+ bzr branch "$1" "$2"
13+ fi
14+}
15+
16 if option hints_bzr; then
17 echo HINTS_BZR:
18 if [ "$DISTRIBUTION" = ubuntu ]; then
19- if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then
20- bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints
21- elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
22- bzr branch lp:~ubuntu-release/britney/hints-ubuntu $DATA_B2/$SERIES-proposed/Hints
23+ if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
24+ branch="lp:~ubuntu-release/britney/hints-ubuntu"
25 else
26- bzr branch lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES $DATA_B2/$SERIES-proposed/Hints
27+ branch="lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES"
28 fi
29- if [ -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch ]; then
30- bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
31- elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
32- bzr branch lp:~ubuntu-touch-release/britney/hints-ubuntu-touch $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
33+ make_hints_branch "$DATA_B2/$SERIES-proposed/Hints" "$branch"
34+ if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
35+ make_hints_branch \
36+ "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch" \
37+ "lp:~ubuntu-touch-release/britney/hints-ubuntu-touch"
38+ else
39+ rm -rf "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch"
40 fi
41 elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then
42- if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then
43- bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints
44- else
45- bzr branch lp:~ubuntu-release/britney/hints-ubuntu-rtm $DATA_B2/$SERIES-proposed/Hints
46- fi
47+ make_hints_branch \
48+ "$DATA_B2/$SERIES-proposed/Hints" \
49+ lp:~ubuntu-release/britney/hints-ubuntu-rtm
50 fi
51- # TODO do something for RTM
52 fi
53
54 run_b1 () {

Subscribers

People subscribed via source and target branches