summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-03-15 11:46:14 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-03-15 11:46:14 +0000
commit1d85c6f4bfed97c9caf46aad443790a9b434fd20 (patch)
treeeab8e9e493b6b591950739393c97f94a245cc944 /cmdline/apt-key
parent01717245170c1fbb8080a9737f1da70877e302e8 (diff)
* ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken)
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-xcmdline/apt-key2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index a96afe944..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -21,7 +21,7 @@ update() {
fi
# add new keys
- $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
+ $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
# remove no-longer used keys
keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`