diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-03-09 01:34:10 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-03-16 17:59:31 +0100 |
| commit | d61960d9244340956a27f4ca46aecd15cc75e18b (patch) | |
| tree | c8f7cb33e08c84bcf06fbff39647dc03bc103afb /test/integration/framework | |
| parent | b0be0e09cfbbcb033eb0b92eaf17ac31a6b9f423 (diff) | |
| parent | 1a0619ac765cc0b2f4906c96c1a4d7f510569a3f (diff) | |
merge debian/sid into debian/experimental
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/framework b/test/integration/framework index 2c794d1f3..5f13df1c0 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -248,7 +248,7 @@ setupenvironment() { echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf fi - cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF + cat << EOF > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" #!/bin/sh set -e if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then @@ -262,7 +262,6 @@ exec fakeroot dpkg --root="${TMPWORKINGDIRECTORY}/rootdir" \\ --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\ --force-not-root --force-bad-path "\$@" EOF - cat "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg @@ -827,7 +826,7 @@ buildaptarchivefromincoming() { [ -e ftparchive.conf ] || createaptftparchiveconfig [ -e dists ] || buildaptftparchivedirectorystructure msgninfo "\tGenerate Packages, Sources and Contents files… " - aptftparchive -qq generate ftparchive.conf + testsuccess aptftparchive generate ftparchive.conf cd - > /dev/null msgdone "info" generatereleasefiles "$@" |