summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-05-22 16:17:08 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-05-22 16:17:08 +0200
commit0f3150e7040f45565b459a1390606bc2f714f6a8 (patch)
tree200b65a080c246b09e6bcdcd81ea82c824272600 /cmdline
parent314b47542c57d0a12c55dd1dd334cf233a33fcfb (diff)
parent4694e07d450baa13fa04482752ca369a5797c640 (diff)
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
Conflicts: apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'cmdline')
-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