diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
| commit | 58d0598ad6f1c514bf7d89fdea676a697f0d9388 (patch) | |
| tree | eade3a15056c5dd70ac0da1953186065c7441c7b /test/integration/framework | |
| parent | 2c53e7d1a82e2bfe44151ac9d1ac2043fca09efa (diff) | |
| parent | 44dc669e08353716da835608ea54563b4c8c32bb (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index 2d9ed3503..2422f0886 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -113,6 +113,7 @@ setupenvironment() { cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/ ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf + echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf echo "Debug::NoLocking \"true\";" >> aptconfig.conf echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf @@ -213,7 +214,7 @@ buildpackage() { fi local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)" local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")" - local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')" + local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')" cd - > /dev/null for PKG in $PKGS; do echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist |