Merge branch 'no-gpg-error' into 'main'

Replace "GPG error" with "OpenPGP signature verification failed"

See merge request apt-team/apt!455

6 files changed, 12 insertions, 12 deletions

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index c7cad4a82..365a0434e 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -200,11 +200,11 @@ test_inrelease_to_invalid_inrelease()
 
     if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     else
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     fi
@@ -227,11 +227,11 @@ test_release_gpg_to_invalid_release_release_gpg()
     inject_evil_package
     if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable Release: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable Release: Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg  Sub-process /usr/bin/sqv returned an error code (1), error message is: Verifying signature:            Message has been manipulated
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     else
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable Release: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable Release: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
 W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg  The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     fi
diff --git a/test/integration/test-apt-update-repeated-ims-hit b/test/integration/test-apt-update-repeated-ims-hit
index 57526c41b..3c171e9d0 100755
--- a/test/integration/test-apt-update-repeated-ims-hit
+++ b/test/integration/test-apt-update-repeated-ims-hit
@@ -41,9 +41,9 @@ sed -i -e 's#^deb #deb [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
 
 APTARCHIVE="$(readlink -f ./aptarchive)"
 if test -e "${METHODSDIR}/sqv"; then
-GPGERROR="W: GPG error: file:$APTARCHIVE  Release: The signatures couldn't be verified because no keyring is specified"
+GPGERROR="W: OpenPGP signature verification failed: file:$APTARCHIVE  Release: The signatures couldn't be verified because no keyring is specified"
 else
-GPGERROR="W: GPG error: file:$APTARCHIVE  Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 5A90D141DBAC8DAE"
+GPGERROR="W: OpenPGP signature verification failed: file:$APTARCHIVE  Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 5A90D141DBAC8DAE"
 fi
 
 msgmsg 'Running update again does not change result' '0'
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index 7a8f57abb..b35cd501c 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -158,11 +158,11 @@ test_inrelease_to_unauth_inrelease() {
 
     if test -e "${METHODSDIR}/sqv"; then
         # FIXME: Do not assert sqv output
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Missing key DE66AECA9151AFA1877EC31DE8525D47528144E2, which is needed to verify signature.
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable InRelease: Sub-process /usr/bin/sqv returned an error code (1), error message is: Missing key DE66AECA9151AFA1877EC31DE8525D47528144E2, which is needed to verify signature.
 W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease  Sub-process /usr/bin/sqv returned an error code (1), error message is: Missing key DE66AECA9151AFA1877EC31DE8525D47528144E2, which is needed to verify signature.
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     else
-        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
+        testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: file:${APTARCHIVE} unstable InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
 W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease  The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
     fi
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index 1f0cbda04..4bfa62a5d 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -49,7 +49,7 @@ testwarningequal "Get:1 http://localhost:${APTHTTPPORT} stable InRelease [$(stat
 Err:1 http://localhost:${APTHTTPPORT} stable InRelease
   Splitting up ${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_dists_stable_InRelease into data and signature failed
 Reading package lists...
-W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: http://localhost:${APTHTTPPORT} stable InRelease: Splitting up ${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_dists_stable_InRelease into data and signature failed
+W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: http://localhost:${APTHTTPPORT} stable InRelease: Splitting up ${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_dists_stable_InRelease into data and signature failed
 W: Failed to fetch http://localhost:${APTHTTPPORT}/dists/stable/InRelease  Splitting up ${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_dists_stable_InRelease into data and signature failed
 W: Some index files failed to download. They have been ignored, or old ones used instead." --nomsg aptget update
 testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')"
diff --git a/test/integration/test-method-gpgv-legacy-keyring b/test/integration/test-method-gpgv-legacy-keyring
index 55ad2463d..89c45b21f 100755
--- a/test/integration/test-method-gpgv-legacy-keyring
+++ b/test/integration/test-method-gpgv-legacy-keyring
@@ -36,7 +36,7 @@ testwarningequal "Hit:1 http://localhost:${APTHTTPPORT} testing InRelease
 Err:1 http://localhost:${APTHTTPPORT} testing InRelease
   $missing_key
 Reading package lists...
-W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: http://localhost:${APTHTTPPORT} testing InRelease: $missing_key
+W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. OpenPGP signature verification failed: http://localhost:${APTHTTPPORT} testing InRelease: $missing_key
 W: Failed to fetch http://localhost:${APTHTTPPORT}/dists/testing/InRelease  $missing_key
 W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -q
 
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 00c72d7d9..1e54cf0d5 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -423,12 +423,12 @@ runtest2() {
 	msgmsg 'Cold archive signed by' 'Empty signature'
 	rm -rf rootdir/var/lib/apt/lists
 	find aptarchive -name Release -exec touch {}.gpg \;
-	testfailuremsg "E: GPG error: http://localhost:${APTHTTPPORT}  Release: Signed file isn't valid, got 'NODATA' (does the network require authentication?)" aptget update -o Debug::gpgv=1
+	testfailuremsg "E: OpenPGP signature verification failed: http://localhost:${APTHTTPPORT}  Release: Signed file isn't valid, got 'NODATA' (does the network require authentication?)" aptget update -o Debug::gpgv=1
 
 	msgmsg 'Cold archive signed by' 'Unknown format signature'
 	rm -rf rootdir/var/lib/apt/lists
 	find aptarchive -name Release -exec sh -c "echo Hello > {}.gpg" \;
-	testfailuremsg "E: GPG error: http://localhost:${APTHTTPPORT}  Release: Signed file isn't valid, got 'NODATA' (does the network require authentication?)" aptget update
+	testfailuremsg "E: OpenPGP signature verification failed: http://localhost:${APTHTTPPORT}  Release: Signed file isn't valid, got 'NODATA' (does the network require authentication?)" aptget update
 
 	find aptarchive/ \( -name InRelease -o -name Release.gpg \) -delete