diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:24:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:27:31 +0200 |
| commit | 05f64ca2e483709faa6bc69dfa79129d2d4c679e (patch) | |
| tree | b0937914182c227b6e662f3820b0e58f86f6c617 /cmdline | |
| parent | f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d (diff) | |
| parent | ae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4 (diff) | |
Merge branch 'debian/jessie' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
cmdline/apt-key.in
methods/https.cc
test/integration/test-apt-key
test/integration/test-multiarch-foreign
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-key.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index cf0b9a96f..2a66ad74d 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -168,7 +168,7 @@ remove_key_from_keyring() { local GPG="$GPG_CMD --keyring $KEYRINGFILE" for KEY in "$@"; do # check if the key is in this keyring: the key id is in the 5 column at the end - if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -q "^[0-9A-F]*${KEY}$"; then + if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -iq "^[0-9A-F]*${KEY}$"; then continue fi if [ ! -w "$KEYRINGFILE" ]; then |