From 4b2a4ab8abb9f9b6ce262882480eee945a041d14 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Oct 2010 12:23:25 +0200
Subject: merge fix for testrun on amd64

---
 test/integration/framework | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/framework b/test/integration/framework
index d832bedbe..95fce1247 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
-- 
cgit v1.2.3