diff options
| author | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-10-31 20:24:05 +0200 |
|---|---|---|
| committer | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-10-31 20:24:05 +0200 |
| commit | 20ba2505a3a2e9f2c526800d154270edce22d78f (patch) | |
| tree | f87779921c7afe67dac81c3a379825d889552e93 | |
| parent | 18c497690be5c6de0d8fcab2729f0c13d782ce8e (diff) | |
Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism.
| -rwxr-xr-x | cmdline/apt-key | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 94c11497c..51a0bc2d1 100755 --- 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 - 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 diff --git a/debian/changelog b/debian/changelog index 9a86b3fa5..c6b7b170c 100644 --- 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) - * cmdline/apt-key: - - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: |