]> git.saurik.com Git - apt.git/commitdiff
fix test/integration/test-apt-key-net-update
authorMichael Vogt <mvo@debian.org>
Thu, 12 Dec 2013 06:49:43 +0000 (07:49 +0100)
committerMichael Vogt <mvo@debian.org>
Thu, 12 Dec 2013 06:49:43 +0000 (07:49 +0100)
test/integration/test-apt-key-net-update

index 2e72d1d62b4a222471f62c8376cb32521e4e244d..73545aff7ba9f1d8cdea5737c9e59c675fd05f2a 100755 (executable)
@@ -21,8 +21,9 @@ TRUSTEDFILE=./etc/apt/trusted.gpg
 mkdir -p ./var/lib/apt/keyrings
 TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
 GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
-GPG="$GPG_CMD --keyring $TRUSTEDFILE"
-MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+
+# FIXME: instead of copying this use apt-key and the buildin apt webserver
+#        to do a real test
 
 # COPYIED from apt-key.in --------------
 
@@ -40,6 +41,9 @@ GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING"
 GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
 #----------------------------------------- END COPY
 
+GPG="$GPG_CMD --keyring $TRUSTEDFILE"
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+
 msgtest "add_keys_with_verify_against_master_keyring"
 if [ ! -e $MASTER_KEYRING ]; then
     echo -n "No $MASTER_KEYRING found"