summaryrefslogtreecommitdiff
path: root/cmdline/apt-key.in
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-04-08 12:24:50 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-04-08 12:24:50 +0200
commit460f0f95b22c36ddc5f184cef33c54a482b5f112 (patch)
tree324f78bd2fdddd6131301129d67fad5e9bf36871 /cmdline/apt-key.in
parent0c235e5d6658bebe3daab6c708d112b3794fd809 (diff)
parentd5cf8851753dde4f45bfd3b48fcdf34247a8752a (diff)
Merge remote-tracking branch 'origin/debian/jessie' into ubuntu/master
Conflicts: apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'cmdline/apt-key.in')
-rw-r--r--cmdline/apt-key.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index b4e071000..1da311d35 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -180,7 +180,7 @@ update() {
remove_key_from_keyring() {
local GPG="$GPG_CMD --keyring $1"
# check if the key is in this keyring: the key id is in the 5 column at the end
- if ! $GPG --with-colons --list-keys 2>&1 | grep -q "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
+ if ! $GPG --with-colons --list-keys 2>&1 | grep -iq "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
return
fi
if [ ! -w "$1" ]; then