← Back to branch summary

~apw/britney/bitney1-ubuntu

« back to all changes in this revision

Viewing changes to britney

  • Committer: Adam Conrad
  • Date: 2015-06-09 17:50:51 UTC
  • mfrom: (280.1.1 fix-sru-branching)
  • Revision ID: adconrad@0c3.net-20150609175051-2v9rcekg8ygun77a
[cjwatson, r=adconrad] Make sure the hints branch always points to the right place, even if it's changed due to e.g. a series being released.

Show diffs side-by-side

added added

removed removed

Lines of Context:
britney
307
307
  lite_sync $DATA_B2 $DATA
308
308
fi
309
309
 
 
310
make_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
 
310
318
if option hints_bzr; then
311
319
  echo HINTS_BZR:
312
320
  if [ "$DISTRIBUTION" = ubuntu ]; then
313
 
    if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then
314
 
      bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints
315
 
    elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
316
 
      bzr branch lp:~ubuntu-release/britney/hints-ubuntu $DATA_B2/$SERIES-proposed/Hints
 
321
    if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
 
322
      branch="lp:~ubuntu-release/britney/hints-ubuntu"
317
323
    else
318
 
      bzr branch lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES $DATA_B2/$SERIES-proposed/Hints
 
324
      branch="lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES"
319
325
    fi
320
 
    if [ -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch ]; then
321
 
      bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
322
 
    elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
323
 
      bzr branch lp:~ubuntu-touch-release/britney/hints-ubuntu-touch $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
 
326
    make_hints_branch "$DATA_B2/$SERIES-proposed/Hints" "$branch"
 
327
    if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
 
328
      make_hints_branch \
 
329
        "$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
333
    fi
325
334
  elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then
326
 
    if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then
327
 
      bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints
328
 
    else
329
 
      bzr branch lp:~ubuntu-release/britney/hints-ubuntu-rtm $DATA_B2/$SERIES-proposed/Hints
330
 
    fi
 
335
    make_hints_branch \
 
336
      "$DATA_B2/$SERIES-proposed/Hints" \
 
337
      lp:~ubuntu-release/britney/hints-ubuntu-rtm
331
338
  fi
332
 
  # TODO do something for RTM
333
339
fi
334
340
 
335
341
run_b1 () {