Kaynağa Gözat

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

Eugene V. Lyubimkin 17 yıl önce
ebeveyn
işleme
20ba2505a3
2 değiştirilmiş dosya ile 3 ekleme ve 5 silme
  1. 3 3
      cmdline/apt-key
  2. 0 2
      debian/changelog

+ 3 - 3
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

+ 0 - 2
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: