[ABI break] use int for the package IDs (thanks to Steve Cotton)

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 94c11497c947d079a8ea028a2f8e28a0fbb37a2b..7bb30240e2a191d0d1fedbb7f52297534f80ca76 100755 (executable)
--- 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
@@ -60,16 +61,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