Explorar o código

Fixed bashisms in apt-key.

Eugene V. Lyubimkin %!s(int64=17) %!d(string=hai) anos
pai
achega
94cb04ddd1
Modificáronse 2 ficheiros con 5 adicións e 3 borrados
  1. 3 3
      cmdline/apt-key
  2. 2 0
      debian/changelog

+ 3 - 3
cmdline/apt-key

@@ -60,16 +60,16 @@ net_update() {
     if [ ! -d /var/lib/apt/keyrings ]; then
     if [ ! -d /var/lib/apt/keyrings ]; then
 	mkdir -p /var/lib/apt/keyrings
 	mkdir -p /var/lib/apt/keyrings
     fi
     fi
-    keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
+    keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING`
     old_mtime=0
     old_mtime=0
     if [ -e $keyring ]; then
     if [ -e $keyring ]; then
-	old_mtime=$(stat -c %Y $keyring)
+	old_mtime=`stat -c %Y $keyring`
     fi
     fi
     (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
     (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
     if [ ! -e $keyring ]; then
     if [ ! -e $keyring ]; then
 	return
 	return
     fi
     fi
-    new_mtime=$(stat -c %Y $keyring)
+    new_mtime=`stat -c %Y $keyring`
     if [ $new_mtime -ne $old_mtime ]; then
     if [ $new_mtime -ne $old_mtime ]; then
 	echo "Checking for new archive signing keys now"
 	echo "Checking for new archive signing keys now"
 	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
 	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING

+ 2 - 0
debian/changelog

@@ -7,6 +7,8 @@ apt (0.7.17) unstable; urgency=low
   * apt-pkg/algorithm.cc:
   * apt-pkg/algorithm.cc:
     - Strip username and password from source URL in error message.
     - Strip username and password from source URL in error message.
       (Closes: #425150)
       (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