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
=== modified file 'britney/fetch-indexes'
--- britney/fetch-indexes 2016-02-27 21:39:11 +0000
+++ britney/fetch-indexes 2016-04-01 13:41:33 +0000
@@ -89,7 +89,7 @@
89 for arch in $PORTS_ARCHES; do89 for arch in $PORTS_ARCHES; do
90 refresh $PORTS/$pocket/$component/binary-$arch/Packages.gz90 refresh $PORTS/$pocket/$component/binary-$arch/Packages.gz
91 done91 done
92 refresh $ARCHIVE/$pocket/$component/source/Sources.bz292 refresh $ARCHIVE/$pocket/$component/source/Sources.gz
93 done93 done
94 done94 done
95fi95fi
@@ -99,7 +99,7 @@
99for arch in $ARCHES $PORTS_ARCHES; do99for arch in $ARCHES $PORTS_ARCHES; do
100 refresh $PPA_URL/binary-$arch/Packages.gz100 refresh $PPA_URL/binary-$arch/Packages.gz
101done101done
102refresh $PPA_URL/source/Sources.bz2102refresh $PPA_URL/source/Sources.gz
103103
104# Get autopkgtest history so that we can correctly identify regressions104# Get autopkgtest history so that we can correctly identify regressions
105DIR=$DATADIR/$SERIES105DIR=$DATADIR/$SERIES
@@ -115,9 +115,9 @@
115 # "Testing" is archive + stable overlay ppa115 # "Testing" is archive + stable overlay ppa
116 DEST=$DATADIR/$SERIES116 DEST=$DATADIR/$SERIES
117 mkdir --parents $DEST117 mkdir --parents $DEST
118 bzcat $CACHE/$SERIES*/*/source/Sources.bz2 \118 zcat $CACHE/$SERIES*/*/source/Sources.gz \
119 $CACHE/$OVERLAY-$SERIES/*/source/Sources.bz2 \119 $CACHE/$OVERLAY-$SERIES/*/source/Sources.gz \
120 > $DEST/Sources120 > $DEST/Sources
121 for arch in $ARCHES $PORTS_ARCHES; do121 for arch in $ARCHES $PORTS_ARCHES; do
122 zcat $CACHE/$SERIES*/*/binary-$arch/Packages.gz \122 zcat $CACHE/$SERIES*/*/binary-$arch/Packages.gz \
123 $CACHE/$OVERLAY-$SERIES/*/binary-$arch/Packages.gz \123 $CACHE/$OVERLAY-$SERIES/*/binary-$arch/Packages.gz \
@@ -128,7 +128,7 @@
128 DEST=$DATADIR/$PPA-$SERIES128 DEST=$DATADIR/$PPA-$SERIES
129 mkdir --parents $DEST129 mkdir --parents $DEST
130 ln --verbose --symbolic --force --no-dereference $HINTDIR $DEST/Hints130 ln --verbose --symbolic --force --no-dereference $HINTDIR $DEST/Hints
131 bzcat $CACHE/$PPA-$SERIES/*/source/Sources.bz2 > $DEST/Sources131 zcat $CACHE/$PPA-$SERIES/*/source/Sources.gz > $DEST/Sources
132 for arch in $ARCHES $PORTS_ARCHES; do132 for arch in $ARCHES $PORTS_ARCHES; do
133 zcat $CACHE/$PPA-$SERIES/*/binary-$arch/Packages.gz > $DEST/Packages_${arch}133 zcat $CACHE/$PPA-$SERIES/*/binary-$arch/Packages.gz > $DEST/Packages_${arch}
134 done134 done

Subscribers

People subscribed via source and target branches

to all changes: