Browse Source

fix test/integration/test-apt-key-net-update

tags/debian/0.9.14.2
Michael Vogt 7 years ago
parent
commit
9b7c10509c
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      test/integration/test-apt-key-net-update

+ 6
- 2
test/integration/test-apt-key-net-update View File

@@ -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"


Loading…
Cancel
Save