diff options
| author | Michael Vogt <egon@bottom> | 2007-06-06 22:42:22 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2007-06-06 22:42:22 +0200 |
| commit | 90485a0039fcf308b0d7fc056d39ee4b91b76c58 (patch) | |
| tree | 76390aa848c02583f0fa425fde39c5a8ff0f8d7a /cmdline | |
| parent | b4dd017206dc92782462dde702076c389567fb57 (diff) | |
| parent | c2f2b86252cec3a9ec68df2f55850067faa705d6 (diff) | |
* implement SourceVer() in pkgRecords
(thanks to Daniel Burrows for the patch!)
* merged from Christian Perrier:
* mr.po: New Marathi translation Closes: #416806
* zh_CN.po: Updated by Eric Pareja Closes: #416822
* tl.po: Updated by Eric Pareja Closes: #416638
* gl.po: Updated by Jacobo Tarrio
Closes: #412828
* da.po: Updated by Claus Hindsgaul
Closes: #409483
* fr.po: Remove a non-breakable space for usability
issues. Closes: #408877
* ru.po: Updated Russian translation. Closes: #405476
* *.po: Unfuzzy after upstream typo corrections
* NMU
* Fix broken use of awk in apt-key that caused removal of the wrong keys
from the keyring. Closes: #412572
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 7460a24be..90ecae2cf 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -24,9 +24,9 @@ update() { $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}'` + keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` for key in $keys; do - if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then + if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then $GPG --quiet --batch --delete-key --yes ${key} fi done |