Просмотр исходного кода

* cmdline/apt-key:
- if command is 'add' do not error out if the specified
keyring doesn't exist, it will be created by gpg

David Kalnischkies лет назад: 15
Родитель
Сommit
9120d409ef
2 измененных файлов с 5 добавлено и 2 удалено
  1. 1 1
      cmdline/apt-key
  2. 4 1
      debian/changelog

+ 1 - 1
cmdline/apt-key

@@ -152,7 +152,7 @@ if [ "$1" = "--keyring" ]; then
         #echo "keyfile given"
 	shift
 	TRUSTEDFILE="$1"
-	if [ -r "$TRUSTEDFILE" ]; then
+	if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then
 		GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
 	else
 		echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable"

+ 4 - 1
debian/changelog

@@ -21,8 +21,11 @@ apt (0.8.15.7) UNRELEASED; urgency=low
       but do not fail if a hash can't be found
   * apt-pkg/acquire.cc:
     - non-existing directories are by definition clean
+  * cmdline/apt-key:
+    - if command is 'add' do not error out if the specified
+      keyring doesn't exist, it will be created by gpg
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 22 Aug 2011 23:08:47 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 23 Aug 2011 11:19:47 +0200
 
 apt (0.8.15.6) unstable; urgency=low