[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#767914: [PATCH] apt: switch test-suite to gpg2.



Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
---
 test/integration/framework | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/framework b/test/integration/framework
index 7923e23..0b3f09d 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -137,7 +137,7 @@ gdb() {
 }
 gpg() {
 	# see apt-key for the whole trickery. Setup is done in setupenvironment
-	command gpg --ignore-time-conflict --no-options --no-default-keyring \
+	command gpg2 --ignore-time-conflict --no-options --no-default-keyring \
 		--homedir "${TMPWORKINGDIRECTORY}/gnupghome" \
 		--no-auto-check-trustdb --trust-model always \
 		"$@"
@@ -250,7 +250,7 @@ setupenvironment() {
 	touch $SECRETKEYRING
 	# now create the trustdb with an (empty) dummy keyring
 	# newer gpg versions are fine without it, but play it safe for now
-	gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1
+	gpg2 --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1
 
 	# cleanup the environment a bit
 	export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
-- 
2.1.0


Reply to: