diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2018-01-19 02:20:40 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2018-01-19 21:55:39 +0100 |
| commit | 38d444af2632219ab399dabadaaefaa4dcdd6ebf (patch) | |
| tree | b4a9896ec04cb8a588db15ff797c3c044d0a43fa /test/integration/framework | |
| parent | 70e68ed87d8ecd011df80f00c6b8ff6316e2b413 (diff) | |
allow the apt/lists/auxfiles/ directory to be missing
apt 1.6~alpha6 introduced aux requests to revamp the implementation of
a-t-mirror. This already included the potential of running as non-root,
but the detection wasn't complete resulting in errors or could produce
spurious warnings along the way if the directory didn't exist yet.
References: ef9677831f62a1554a888ebc7b162517d7881116
Closes: 887624
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index ff7a7c514..ecce46d2e 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -177,7 +177,11 @@ runapt() { sh|aptitude|*/*|command) ;; *) CMD="${BUILDDIRECTORY}/$CMD";; esac - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH="${LIBRARYPATH}:${LD_LIBRARY_PATH}" "$CMD" "$@" + if [ "$CMD" = 'aptitude' ]; then + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH="${LIBRARYPATH}:${LD_LIBRARY_PATH}" command "$CMD" "$@" + else + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH="${LIBRARYPATH}:${LD_LIBRARY_PATH}" "$CMD" "$@" + fi } runpython3() { runapt command python3 "$@"; } aptconfig() { runapt apt-config "$@"; } |