From 94cb04ddd1f9221e16680dceb98afad6a1273c50 Mon Sep 17 00:00:00 2001
From: "Eugene V. Lyubimkin" <jackyf@1501-debian>
Date: Wed, 29 Oct 2008 22:01:52 +0200
Subject: Fixed bashisms in apt-key.

---
 cmdline/apt-key | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmdline/apt-key')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 51a0bc2d1..94c11497c 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -60,16 +60,16 @@ net_update() {
     if [ ! -d /var/lib/apt/keyrings ]; then
 	mkdir -p /var/lib/apt/keyrings
     fi
-    keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
+    keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING`
     old_mtime=0
     if [ -e $keyring ]; then
-	old_mtime=$(stat -c %Y $keyring)
+	old_mtime=`stat -c %Y $keyring`
     fi
     (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
     if [ ! -e $keyring ]; then
 	return
     fi
-    new_mtime=$(stat -c %Y $keyring)
+    new_mtime=`stat -c %Y $keyring`
     if [ $new_mtime -ne $old_mtime ]; then
 	echo "Checking for new archive signing keys now"
 	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
-- 
cgit v1.2.3-70-g09d2


From 20ba2505a3a2e9f2c526800d154270edce22d78f Mon Sep 17 00:00:00 2001
From: "Eugene V. Lyubimkin" <jackyf@1501-debian>
Date: Fri, 31 Oct 2008 20:24:05 +0200
Subject: Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism.

---
 cmdline/apt-key  | 6 +++---
 debian/changelog | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'cmdline/apt-key')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 94c11497c..51a0bc2d1 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -60,16 +60,16 @@ net_update() {
     if [ ! -d /var/lib/apt/keyrings ]; then
 	mkdir -p /var/lib/apt/keyrings
     fi
-    keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING`
+    keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
     old_mtime=0
     if [ -e $keyring ]; then
-	old_mtime=`stat -c %Y $keyring`
+	old_mtime=$(stat -c %Y $keyring)
     fi
     (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
     if [ ! -e $keyring ]; then
 	return
     fi
-    new_mtime=`stat -c %Y $keyring`
+    new_mtime=$(stat -c %Y $keyring)
     if [ $new_mtime -ne $old_mtime ]; then
 	echo "Checking for new archive signing keys now"
 	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
diff --git a/debian/changelog b/debian/changelog
index 9a86b3fa5..c6b7b170c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,6 @@ apt (0.7.17) unstable; urgency=low
   * apt-pkg/algorithm.cc:
     - Strip username and password from source URL in error message.
       (Closes: #425150)
-  * cmdline/apt-key:
-    - Fixed bashisms;
   * debian/rules:
     - Fixed lintian warnings "debian/rules ignores make errors".
   * debian/control:
-- 
cgit v1.2.3-70-g09d2


From dac074b0ad8925ea542edea8ffd113736364344e Mon Sep 17 00:00:00 2001
From: "Eugene V. Lyubimkin" <jackyf@1501-debian>
Date: Fri, 31 Oct 2008 21:21:18 +0200
Subject: Added 'unset GREP_OPTIONS' to apt-key.

---
 cmdline/apt-key  | 1 +
 debian/changelog | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'cmdline/apt-key')

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
 
-- 
cgit v1.2.3-70-g09d2