diff options
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/integration/framework b/test/integration/framework index f7c68859f..cfd621105 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -909,10 +909,17 @@ insertpackage() { If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and serve no other purpose…}" + local SECTION="${8:-other}" + + if [ "$SECTION" = "${SECTION#*/}" ]; then + DISTSECTION="main" + else + DISTSECTION="${SECTION%/*}" + fi local ARCHS="" for RELEASE in $(printf '%s' "$RELEASES" | tr ',' '\n'); do if [ "$RELEASE" = 'installed' ]; then - insertinstalledpackage "$2" "$3" "$4" "$5" "$6" "$7" + insertinstalledpackage "$2" "$3" "$4" "$5" "$6" "$7" "$8" continue fi for arch in $(getarchitecturesfromcommalist "$ARCH"); do @@ -922,17 +929,17 @@ insertpackage() { ARCHS="$arch" fi for BUILDARCH in $ARCHS; do - local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}" + local PPATH="aptarchive/dists/${RELEASE}/${DISTSECTION}/binary-${BUILDARCH}" mkdir -p "$PPATH" { echo "Package: $NAME Priority: $PRIORITY -Section: other +Section: $SECTION Installed-Size: 42 Maintainer: Joe Sixpack <joe@example.org>" test "$arch" = 'none' || echo "Architecture: $arch" echo "Version: $VERSION -Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" +Filename: pool/${DISTSECTION}/${NAME}/${NAME}_${VERSION}_${arch}.deb" test -z "$DEPENDENCIES" || printf "%b\n" "$DEPENDENCIES" echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)" echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)" @@ -941,12 +948,12 @@ Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" } >> "${PPATH}/Packages" done done - mkdir -p "aptarchive/dists/${RELEASE}/main/source" "aptarchive/dists/${RELEASE}/main/i18n" - touch "aptarchive/dists/${RELEASE}/main/source/Sources" + mkdir -p "aptarchive/dists/${RELEASE}/${DISTSECTION}/source" "aptarchive/dists/${RELEASE}/${DISTSECTION}/i18n" + touch "aptarchive/dists/${RELEASE}/${DISTSECTION}/source/Sources" echo "Package: $NAME Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1) Description-en: $DESCRIPTION -" >> "aptarchive/dists/${RELEASE}/main/i18n/Translation-en" +" >> "aptarchive/dists/${RELEASE}/${DISTSECTION}/i18n/Translation-en" done } @@ -991,6 +998,7 @@ insertinstalledpackage() { If you find such a package installed on your system, something went horribly wrong! They are autogenerated und used only by testcases and serve no other purpose…}" + local SECTION="${8:-other}" local FILE='rootdir/var/lib/dpkg/status' local INFO='rootdir/var/lib/dpkg/info' @@ -998,7 +1006,7 @@ insertinstalledpackage() { echo "Package: $NAME Status: $STATUS Priority: $PRIORITY -Section: other +Section: $SECTION Installed-Size: 42 Maintainer: Joe Sixpack <joe@example.org> Version: $VERSION" >> "$FILE" |