diff options
-rwxr-xr-x | cmdline/apt-key | 1 | ||||
-rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..7bb30240e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,6 +1,7 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available diff --git a/debian/changelog b/debian/changelog index 625dd8e0b..beef99123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ apt (0.7.17) unstable; urgency=low - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300 |