britney

Merge lp:~cjwatson/britney/honour-updates into lp:~ubuntu-release/britney/britney1-ubuntu

  1. honour-updates
  2. Merge into britney1-ubuntu
Proposed by Colin Watson
Status: Merged
Merged at revision: 277
Proposed branch: lp:~cjwatson/britney/honour-updates
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 34 lines (+16/-7)
1 file modified
britney (+16/-7)
To merge this branch: bzr merge lp:~cjwatson/britney/honour-updates
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+250309@code.launchpad.net

This proposal supersedes a proposal from 2015-02-19.

Commit message

Include $SERIES-updates in the baseline Sources/Packages data files.

Description of the change

For stable releases, we need to include $SERIES-updates in the baseline Sources/Packages data files that britney.py itself uses for suite comparison, because -proposed is allowed to depend on things only in -updates. I've checked that britney2 uses the highest version of a package it finds in any suite.

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-02-18 15:37:12 +0000
+++ britney 2015-02-19 13:50:45 +0000
@@ -232,14 +232,23 @@
232pkg_lists () {232pkg_lists () {
233 for suite in $SERIES $SERIES-proposed; do233 for suite in $SERIES $SERIES-proposed; do
234 mkdir -p $1/$suite234 mkdir -p $1/$suite
235 suite_dir=$FTP_MIRROR/dists/$suite235 suite_dirs=$FTP_MIRROR/dists/$suite
236 gzip -t $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz236 if [ "$suite" = "$SERIES" ]; then
237 zcat $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz >$1/$suite/Sources237 suite_dirs="$suite_dirs $FTP_MIRROR/dists/$SERIES-updates"
238 fi
239 >$1/$suite/Sources
240 for suite_dir in $suite_dirs; do
241 gzip -t $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz
242 zcat $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz >>$1/$suite/Sources
243 done
238 for arch in `suite_arches $suite`; do244 for arch in `suite_arches $suite`; do
239 gzip -t $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz245 >$1/$suite/Packages_$arch
240 zcat $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz >$1/$suite/Packages_$arch246 for suite_dir in $suite_dirs; do
241 gzip -t $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz247 gzip -t $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz
242 zcat $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch248 zcat $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch
249 gzip -t $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz
250 zcat $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch
251 done
243 done252 done
244 done253 done
245 $FAUXPKG_SCRIPT generate $1/$SERIES $1/$SERIES-proposed254 $FAUXPKG_SCRIPT generate $1/$SERIES $1/$SERIES-proposed

Subscribers

People subscribed via source and target branches