Fixed bashisms in apt-key.

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 51a0bc2d156b7d3c8d487e48e13129c0ab248148..94c11497c947d079a8ea028a2f8e28a0fbb37a2b 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 40e1cc23df9bdf889064752ef144c49116ec50a0..dedb574b84b97bb6a39c74b4409912d7df34e9b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ 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;

 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
 
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300