diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-10-13 22:27:56 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-10-13 22:27:56 +0200 |
| commit | 2faaf8bea85149fb131735a6bd7437fec3771ee0 (patch) | |
| tree | 6c6ccb53abac45fdf9cb1f6fb3991ac4bcecb5c1 /test/integration/framework | |
| parent | 3b9c5cc2bdf1584525792aafe4e8f15d09951583 (diff) | |
| parent | be61b563c20267c521494cca92bd7ac158366c89 (diff) | |
merge with debian-sid
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework index c09afcbad..2422f0886 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -64,6 +64,8 @@ runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " if [ -f ./aptconfig.conf ]; then APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* + elif [ -f ../aptconfig.conf ]; then + APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* else LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* fi @@ -111,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 |