diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-12-19 14:57:39 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-12-19 14:57:39 +0100 |
| commit | f00d26304c1febd47d5d9aefdcb9dd7e25f4058c (patch) | |
| tree | 8c0487dcbdf4563aefe40afc2cc2b71e3a6e7e56 /cmdline/apt-key | |
| parent | aff87a762f86ed47f2b81ccbac23faa5d9fddcdb (diff) | |
| parent | 383594799377d5e628ee84557218f538d7b0bc0a (diff) | |
merged from bzr.debian.net
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 3bd1a92d9..c7db9a25a 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,7 +5,7 @@ set -e # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" @@ -21,7 +21,7 @@ update() { fi # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import # remove no-longer used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` |