diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-29 11:47:20 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-29 11:47:20 +0200 |
| commit | 7a8e00715588564a5b9434eaad65f2c6d3e513bb (patch) | |
| tree | 4a0861fb35cf5b722b7219c69ae85e0daac86f19 | |
| parent | c292cc32b3ab0d70c63e68f7c94446932217c0ec (diff) | |
| parent | 7ffac4c10144a8458fec6de03c58f3b49d081e5c (diff) | |
Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans
| -rw-r--r-- | cmdline/apt-key.in | 3 | ||||
| -rwxr-xr-x | test/integration/test-bug-728500-tempdir | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 83a7a31b9..7a3852ee8 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -384,6 +384,9 @@ if [ "$command" != "help" ]; then # gpg needs (in different versions more or less) files to function correctly, # so we give it its own homedir and generate some valid content for it + if [ ! -d "$TMPDIR" ]; then + unset TMPDIR + fi GPGHOMEDIR="$(mktemp -d)" CURRENTTRAP="${CURRENTTRAP} rm -rf '${GPGHOMEDIR}';" trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir index e9df0a709..37e5a013e 100755 --- a/test/integration/test-bug-728500-tempdir +++ b/test/integration/test-bug-728500-tempdir @@ -27,3 +27,4 @@ fi unset TMPDIR testequal 'coolstuff' aptcache pkgnames +testsuccess ls rootdir/var/lib/apt/lists/*InRelease |