diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-08-23 11:20:51 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-08-23 11:20:51 +0200 |
| commit | 9120d409efc74891d008a7cfc5180c1ac8645c8c (patch) | |
| tree | b160562c3ed9eec95e2874bd86ca4b413016edeb | |
| parent | 8de79b68a834a6cc7abb8976e96ed19374fc02a2 (diff) | |
* cmdline/apt-key:
- if command is 'add' do not error out if the specified
keyring doesn't exist, it will be created by gpg
| -rwxr-xr-x | cmdline/apt-key | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index e632be706..97d6e0323 100755 --- a/cmdline/apt-key +++ b/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" diff --git a/debian/changelog b/debian/changelog index e1c9ac350..0311979af 100644 --- a/debian/changelog +++ b/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 |