Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism.

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 94c11497c947d079a8ea028a2f8e28a0fbb37a2b..51a0bc2d156b7d3c8d487e48e13129c0ab248148 100755 (executable)
--- 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
     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=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
     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
     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 9a86b3fa5071617d3cbb2dc044a4c5bcf459c85b..c6b7b170c09a65c93b2e223e5b7b0288223a4007 100644 (file)
--- 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)
   * 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:
   * debian/rules:
     - Fixed lintian warnings "debian/rules ignores make errors".
   * debian/control: