Sfoglia il codice sorgente

* cmdline/apt-key:
- do not hardcode /etc but use Dir::Etc instead

Michael Vogt 14 anni fa
parent
commit
563fd891d8
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 2 1
      cmdline/apt-key
  2. 4 0
      debian/changelog

+ 2 - 1
cmdline/apt-key

@@ -11,7 +11,8 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k
 
 if [ "$(id -u)" -eq 0 ]; then
 	# we could use a tmpfile here too, but creation of this tends to be time-consuming
-	GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
+	eval $(apt-config shell TRUSTDBDIR Dir::Etc/d)
+	GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
 fi
 
 GPG="$GPG_CMD"

+ 4 - 0
debian/changelog

@@ -7,6 +7,10 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   [ Translation of programs ]
   * Danish by Joe Hansen. Closes: #675605
   * French updated by Christian Perrier
+  
+  [ Sebastian Heinlein ]
+  * cmdline/apt-key:
+    - do not hardcode /etc but use Dir::Etc instead
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 18:25:18 +0200