diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 16:34:08 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 16:34:08 +0000 |
| commit | cfa42a83905b748e5148a8042a4069925a48f03d (patch) | |
| tree | de78b7e160395b7fff7c3ef19142addf04bed753 /cmdline | |
| parent | 1df60952e243b794fd94cb1e2476fd9e19d230a0 (diff) | |
| parent | 8a139d4dbda22b1e4ad3e99b1267b1085293add6 (diff) | |
Merge apt--mvo--0
Patches applied:
* 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}'` |