[pkg-wine-party] [wine] 01/01: Make test if multiarch is enabled work with multiple foreign archs.

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Dec 11 21:47:34 UTC 2015


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

jreyer-guest pushed a commit to branch master
in repository wine.

commit 8d619336af8ce0ba3b75bc5e966fb98a87cd0d3b
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Dec 11 18:48:34 2015 +0100

    Make test if multiarch is enabled work with multiple foreign archs.
    
    Closes: #779012
---
 debian/scripts/wine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/scripts/wine b/debian/scripts/wine
index 7721719..eb929a9 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -10,7 +10,7 @@ if test -x $wine32 -a "$WINEARCH" != "win64"; then
     wine=$wine32
 elif test -x $wine64; then
     wine=$wine64
-    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures)" != "i386" ]; then
+    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ]; then
         echo "it looks like multiarch needs to be enabled.  as root, please"
         echo "execute \"dpkg --add-architecture i386 && apt-get update &&"
         echo "apt-get install $(echo $name | sed s/wine/wine32/)\""

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



More information about the pkg-wine-party mailing list