Przeglądaj źródła

Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans

Michael Vogt 11 lat temu
rodzic
commit
7a8e007155
2 zmienionych plików z 4 dodań i 0 usunięć
  1. 3 0
      cmdline/apt-key.in
  2. 1 0
      test/integration/test-bug-728500-tempdir

+ 3 - 0
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

+ 1 - 0
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