diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-12 07:49:43 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-12 07:49:43 +0100 |
| commit | 9b7c10509c534b7d413b5102231cb0ca387f1c65 (patch) | |
| tree | facfe7616d53977759a669ecb9080c5d1e8f80c6 /test/integration/test-apt-key-net-update | |
| parent | 017d3f3b4b0da976b1d2ecfcd26251369c5aec88 (diff) | |
fix test/integration/test-apt-key-net-update
Diffstat (limited to 'test/integration/test-apt-key-net-update')
| -rwxr-xr-x | test/integration/test-apt-key-net-update | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update index 2e72d1d62..73545aff7 100755 --- a/test/integration/test-apt-key-net-update +++ b/test/integration/test-apt-key-net-update @@ -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" |