diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-01-26 21:09:47 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-01-26 21:09:47 +0100 |
| commit | 07aca07ae73016aa7823e708dda746eec8346989 (patch) | |
| tree | 3a01c1e9cad81c4de651c1ab939c572d2a5d8ffd /test/integration | |
| parent | d17f2b1b748c8d297474707cfc9706f673ef0346 (diff) | |
get sources for packages in multiple releases again
In 321213f0dcdcdaab04e01663e7a047b261400c9c Andreas Cadhalpun corrected
the incorrect overriding of earlier better-fitting results with later
(semi-)matches – but that broke the case in which packages are in multiple
releases in the same version (and the user has both releases configured).
Closes: 812497
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 22 | ||||
| -rwxr-xr-x | test/integration/test-apt-get-source | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/test/integration/framework b/test/integration/framework index c547032c2..b0be3eaf1 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -849,31 +849,33 @@ Description-en: $DESCRIPTION } insertsource() { - local RELEASE="$1" + local RELEASES="$1" local NAME="$2" local ARCH="$3" local VERSION="$4" local DEPENDENCIES="$5" - local BINARY="${6:-$NAME}" + local BINARY="${6:-$NAME}" local ARCHS="" - local SPATH="aptarchive/dists/${RELEASE}/main/source" - mkdir -p $SPATH - local FILE="${SPATH}/Sources" - local DSCFILE="${NAME}_${VERSION}.dsc" - local TARFILE="${NAME}_${VERSION}.tar.gz" - echo "Package: $NAME + for RELEASE in $(printf '%s' "$RELEASES" | tr ',' '\n'); do + local SPATH="aptarchive/dists/${RELEASE}/main/source" + mkdir -p $SPATH + local FILE="${SPATH}/Sources" + local DSCFILE="${NAME}_${VERSION}.dsc" + local TARFILE="${NAME}_${VERSION}.tar.gz" + echo "Package: $NAME Binary: $BINARY Version: $VERSION Maintainer: Joe Sixpack <joe@example.org> Architecture: $ARCH" >> $FILE - test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> "$FILE" - echo "Files: + test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> "$FILE" + echo "Files: $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) "$DSCFILE" $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) "$TARFILE" Checksums-Sha256: $(echo -n "$DSCFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) "$DSCFILE" $(echo -n "$TARFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) "$TARFILE" " >> "$FILE" + done } insertinstalledpackage() { diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 10a190b6c..4b5375d0c 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -16,8 +16,8 @@ insertpackage 'unstable' 'foo' 'all' '2.0' insertsource 'unstable' 'foo' 'all' '2.0' # binary packages with Source-field -insertpackage 'unstable' 'bin' 'i386' '3-2+b1' 'Source: bin (3-2)' -insertsource 'unstable' 'bin' 'any' '3-2' +insertpackage 'unstable,testing' 'bin' 'i386' '3-2+b1' 'Source: bin (3-2)' +insertsource 'unstable,testing' 'bin' 'any' '3-2' insertpackage 'stable' 'bin' 'i386' '2-2+b1' 'Source: bin-backport (2-2)' insertsource 'stable' 'bin-backport' 'any' '2-2' |