summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-05-02 13:40:45 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-05-02 13:40:45 +0200
commit66c8f0766ef9f2d660251ece524fcb82d5ea3813 (patch)
tree561f837db522d16779fd1201cdc0719345671911 /cmdline
parenteaa204a9808eb2392f4a03d703b585ba3aa3b018 (diff)
parent3036f1e491ec1c71fb8fe9ff35954cebb2574320 (diff)
* apt-pkg/acquire.{cc,h}:
* Fix broken use of awk in apt-key that caused removal of the wrong keys from the keyring. Closes: #412572 * 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 * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) * 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-xcmdline/apt-key4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index be2b19a1a..7c1aad0cf 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