summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2005-03-30 23:21:11 +0000
committerOtavio Salvador <otavio@debian.org>2005-03-30 23:21:11 +0000
commit42ac13b328d84f385fbe09740a6bbf65f9d9b073 (patch)
tree72d609041129e679658d0877d1e957c3b9cb5852 /cmdline/apt-key
parente55e9b3b30427ff8febe18731bd7cfc53f69e2fa (diff)
parentd73e594e888fbc099bba84726df72eedcee5272c (diff)
Sync with apt@packages.debian.org/apt--main--0--patch-74
Patches applied: * apt@packages.debian.org/apt--main--0--patch-72 Open 0.6.36 * apt@packages.debian.org/apt--main--0--patch-73 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-74 Update changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-9 * be more carefull when building the archive path (thanks to matt!) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-10 * ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-11 * run check_size_constraints independent of AUTOCLEAN (thanks Matt) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-12 * check cache size after AUTOCLEAN was run (but independent) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-13 * MinAge implemented, cron script variables documented, bugfix in check_stamp() function
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}'`