summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2010-10-13 13:38:13 +0200
committerMichael Vogt <mvo@debian.org>2010-10-13 13:38:13 +0200
commit0497fc4c09c434ea34aa4dbfe773451d9a7082d6 (patch)
tree334b8273078636f0341d3dd24f1ab3b39a1ead4a /test/integration
parent3a97e9665d126a582c830376bfded145c0f9b2d1 (diff)
parent4b2a4ab8abb9f9b6ce262882480eee945a041d14 (diff)
* debian/apt.cron.daily:
- source /etc/default/locale (if available) so that the apt-get update cron job fetches the right translated package descriptions * fix test failure on amd64
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework
index c09afcbad..e2c5234e2 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