diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-12-16 18:25:29 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2007-12-16 18:25:29 -0200 |
| commit | 9129f2af997bf10530432c6d7cd9711cd3dbbba1 (patch) | |
| tree | ddcbdc150bc0250a24766dbedc55654a97794353 /cmdline | |
| parent | 885d204bd354739187413005874797504f3b95f3 (diff) | |
* Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
apt-get to ignore time conflicts, closes: #451328.
Diffstat (limited to 'cmdline')
| -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` |