Merge lp:~cjwatson/bileto/no-bzip2 into lp:bileto

Proposed by Colin Watson
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 447
Merged at revision: 447
Proposed branch: lp:~cjwatson/bileto/no-bzip2
Merge into: lp:bileto
Diff against target: 43 lines (+6/-6)
1 file modified
britney/fetch-indexes (+6/-6)
To merge this branch: bzr merge lp:~cjwatson/bileto/no-bzip2
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
Martin Pitt Approve
Review via email: mp+290736@code.launchpad.net

Commit message

Use gzipped Sources files as well as Packages.

Description of the change

Use gzipped Sources files as well as Packages. xenial no longer has .bz2; the most preferred form is actually .xz these days, but implementing .xz with a fallback to .gz is more effort, while this is easy and will work on all current series.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

+1, thanks Colin!

review: Approve
Revision history for this message
Robert Bruce Park (robru) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'britney/fetch-indexes'
2--- britney/fetch-indexes 2016-02-27 21:39:11 +0000
3+++ britney/fetch-indexes 2016-04-01 13:41:33 +0000
4@@ -89,7 +89,7 @@
5 for arch in $PORTS_ARCHES; do
6 refresh $PORTS/$pocket/$component/binary-$arch/Packages.gz
7 done
8- refresh $ARCHIVE/$pocket/$component/source/Sources.bz2
9+ refresh $ARCHIVE/$pocket/$component/source/Sources.gz
10 done
11 done
12 fi
13@@ -99,7 +99,7 @@
14 for arch in $ARCHES $PORTS_ARCHES; do
15 refresh $PPA_URL/binary-$arch/Packages.gz
16 done
17-refresh $PPA_URL/source/Sources.bz2
18+refresh $PPA_URL/source/Sources.gz
19
20 # Get autopkgtest history so that we can correctly identify regressions
21 DIR=$DATADIR/$SERIES
22@@ -115,9 +115,9 @@
23 # "Testing" is archive + stable overlay ppa
24 DEST=$DATADIR/$SERIES
25 mkdir --parents $DEST
26- bzcat $CACHE/$SERIES*/*/source/Sources.bz2 \
27- $CACHE/$OVERLAY-$SERIES/*/source/Sources.bz2 \
28- > $DEST/Sources
29+ zcat $CACHE/$SERIES*/*/source/Sources.gz \
30+ $CACHE/$OVERLAY-$SERIES/*/source/Sources.gz \
31+ > $DEST/Sources
32 for arch in $ARCHES $PORTS_ARCHES; do
33 zcat $CACHE/$SERIES*/*/binary-$arch/Packages.gz \
34 $CACHE/$OVERLAY-$SERIES/*/binary-$arch/Packages.gz \
35@@ -128,7 +128,7 @@
36 DEST=$DATADIR/$PPA-$SERIES
37 mkdir --parents $DEST
38 ln --verbose --symbolic --force --no-dereference $HINTDIR $DEST/Hints
39- bzcat $CACHE/$PPA-$SERIES/*/source/Sources.bz2 > $DEST/Sources
40+ zcat $CACHE/$PPA-$SERIES/*/source/Sources.gz > $DEST/Sources
41 for arch in $ARCHES $PORTS_ARCHES; do
42 zcat $CACHE/$PPA-$SERIES/*/binary-$arch/Packages.gz > $DEST/Packages_${arch}
43 done

Subscribers

People subscribed via source and target branches

to all changes: