[Pkg-gnupg-commit] [gnupg2] 02/09: enable test to run as non-root on systems that are already setup with wine32

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 21874f81d1b3ea2328638697c5ec681bcb46899f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Mar 30 13:39:50 2016 -0400

    enable test to run as non-root on systems that are already setup with wine32
---
 debian/tests/gpgv-win32 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
index eac45d9..82a150a 100644
--- a/debian/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32
@@ -8,9 +8,11 @@ arch=$(dpkg --print-architecture)
 
 case "$arch" in
     amd64)
-        echo "I: setting up multiarch"
-        dpkg --add-architecture i386
-        apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+        if ! dpkg --print-foreign-architectures | grep -Fqx i386; then
+            echo "I: setting up multiarch"
+            dpkg --add-architecture i386
+            apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+        fi
     ;;
     i386)
         : nothing, tests should just work
@@ -21,7 +23,9 @@ case "$arch" in
         ;;
 esac
 
-DEBIAN_FRONTEND=noninteractive apt-get install -qy wine32 # FIXME ditto
+if ! dpkg-query --status wine32 | grep -Fqx 'Status: install ok installed'; then
+    DEBIAN_FRONTEND=noninteractive apt-get install -qy wine32 # FIXME ditto
+fi
 
 echo 'allow-loopback-pinentry:0:1' | gpgconf --change-options gpg-agent
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git