summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene V. Lyubimkin <jackyf@1501-debian>2008-10-31 21:21:18 +0200
committerEugene V. Lyubimkin <jackyf@1501-debian>2008-10-31 21:21:18 +0200
commitdac074b0ad8925ea542edea8ffd113736364344e (patch)
treed9ef8b4a168726b75385207131082fdaa818f854
parentacbd8c84cf41ab41172d6197439c36f71220e40e (diff)
downloadapt-dac074b0ad8925ea542edea8ffd113736364344e.tar.gz
Added 'unset GREP_OPTIONS' to apt-key.
-rwxr-xr-xcmdline/apt-key1
-rw-r--r--debian/changelog4
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