diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-03-28 15:27:22 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-03-28 15:27:22 +0000 |
| commit | 3c8b747a2ceab1c6ba6d7e9992b4fa42e16f778f (patch) | |
| tree | e4fcdf299f07db438f7f149638e72efef79dd221 /cmdline | |
| parent | e8044cfac86e388d2b894d497be256b82bda52d6 (diff) | |
| parent | 0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff) | |
Sync with Matt
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
* apt@packages.debian.org/apt--main--0--patch-75
Merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-76
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')
| -rwxr-xr-x | cmdline/apt-key | 2 |
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}'` |