[pkg-wine-party] [wine] 01/02: If wine32 is missing warn about it unless err output is disabled.

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Apr 15 20:03:45 UTC 2016


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

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

commit 9e6573170821325e5212c89612f023205f7a0e0c
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Apr 15 21:59:29 2016 +0200

    If wine32 is missing warn about it unless err output is disabled.
    
    Closes in stable: #818874
    
    Don't show the warning if WINEDEBUG is set to not show errors
    (err-all or -all).
    Display the multiarch instructions only if needed.
---
 debian/scripts/wine | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/scripts/wine b/debian/scripts/wine
index 0496525..253b0de 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -6,6 +6,17 @@ bindir=/usr/lib/$script
 wine32=$bindir/wine
 wine64=$bindir/wine64
 
+wine32_hint () {
+    echo "it looks like wine32 is not installed.  this is not supported, you should install it."
+    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ]; then
+        echo "multiarch needs to be enabled first.  as root, please"
+        echo "execute \"dpkg --add-architecture i386 && apt-get update &&"
+        echo "apt-get install $(echo $script | sed s/wine/wine32/)\""
+    else
+        echo "as root, please execute \"apt-get install $(echo $script | sed s/wine/wine32/)\""
+    fi
+}
+
 if test -x $wine32; then
     wine=$wine32
 elif test -x $wine64; then
@@ -13,11 +24,16 @@ elif test -x $wine64; then
     if test -z "$WINELOADER"; then
         export WINELOADER=$wine64
     fi
-    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ] ||
-       [ "$WINEARCH" = "win32" ]; then
-        echo "it looks like multiarch needs to be enabled.  as root, please" >&2
-        echo "execute \"dpkg --add-architecture i386 && apt-get update &&" >&2
-        echo "apt-get install $(echo $script | sed s/wine/wine32/)\"" >&2
+    if test -z "$WINEDEBUG"; then
+        wine32_hint >&2
+    else
+        case "$WINEDEBUG" in
+            -all*|*,-all*|*err-all*)
+                ;;
+            *)
+                wine32_hint >&2
+                ;;
+        esac
     fi
 else
     echo "error: unable to find wine executable.  this shouldn't happen." >&2

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