Attachment 108515 Details for Bug 148683

Patch for menu.ycp and /sbin/yast script

yast2.patch (text/x-patch), 3.37 KB, created by Katarina Machalkova on 2006-12-06 14:16:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katarina Machalkova

Created: 2006-12-06 14:16:50 UTC

Size: 3.37 KB

patch

obsolete

>Index: library/desktop/src/menu.ycp
>===================================================================
>--- library/desktop/src/menu.ycp	(revision 34766)
>+++ library/desktop/src/menu.ycp	(working copy)
>@@ -84,13 +84,15 @@
>  */
> define boolean Launch(string modul) {
>     string function = Modules[modul, "X-SuSE-YaST-Call"]:"";
>-    list arguments = splitstring(Modules[modul, "X-SuSE-YaST-Argument"]:"", " ");
>-    y2debug("Calling: %1 (%2)", function, arguments);
>+    string argument = Modules[modul, "X-SuSE-YaST-Argument"]:"";
>+    y2debug("Calling: %1 (%2)", function, argument);
> 
>     if(function != "") {
> 
>-	any ret = WFM::CallFunction (function, arguments);
>-	y2debug("WFM::CallFunction (%1, %2) returns: %3", function, arguments, ret);
>+	string cmd = sformat ("/sbin/yast %1 %2 >&2", function, argument);
>+	any ret = UI::RunInTerminal(cmd);
>+	y2milestone ("Got %1 from %2", ret, cmd);
>+
> 	if ((function == "online_update" && ret == -42) || ret == `restart_menu)
> 	{
> 	    y2milestone ("yast needs to be restarted - exiting...");
>Index: VERSION
>===================================================================
>--- VERSION	(revision 34766)
>+++ VERSION	(working copy)
>@@ -1 +1 @@
>-2.14.15
>+2.15.0
>Index: scripts/yast2
>===================================================================
>--- scripts/yast2	(revision 34766)
>+++ scripts/yast2	(working copy)
>@@ -166,7 +166,7 @@
> 		    export LC_CTYPE=${LANG%%[.@]*}.UTF-8
> 	        ;;
> 	    esac
>-	    if /bin/testutf8 ; [ $? -ne 2 ] ; then
>+	    if /bin/testutf8 ; [ $? -eq 1 ] ; then
> 		/usr/bin/test -x /bin/unicode_start && /bin/unicode_start
> 		uc_started=1
> 	    fi
>@@ -178,17 +178,22 @@
> 		    # binary /bin/testutf8 is missing at least on s390x, #158001
> 		    /usr/bin/test -x /bin/testutf8 && UTF8TESTED=1 && /bin/testutf8
> 		    # return code of the /bin/testutf8
>-		    # 0=utf-unknown, 1=utf-ok, 2=utf-err
>+		    # 0=stdin does not support utf8, 1=not utf8, 2=utf8
>+
> 		    UTF8STATUS=$?
> 		    
>-		    # not tested or not working UTF-8 support
>-		    if [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -ne 2 ] ; then
>+		    # the terminal supports utf8, but it's not currently set
>+		    # so strip .UTF-8 suffix from locale	
>+		    if [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 1 ] ; then
> 			/usr/bin/test -n "$LANG" && LANG=${LANG%.UTF-8}
> 			/usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%.UTF-8}
>-		    else
>+		    # the terminal supports utf8 and it is currently set
>+		    # so strip any possible suffix from locale and append .UTF-8
>+		    elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then 
> 			/usr/bin/test -n "$LANG" && LANG=${LANG%%[.@]*}.UTF-8
> 			/usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.@]*}.UTF-8
> 		    fi
>+		    #default: do nothing, keep locale untouched
> 		;;
> 	    esac
> 	fi
>Index: package/yast2.changes
>===================================================================
>--- package/yast2.changes	(revision 34766)
>+++ package/yast2.changes	(working copy)
>@@ -1,4 +1,12 @@
> -------------------------------------------------------------------
>+Tue Dec  5 11:20:10 CET 2006 - kmachalkova@suse.cz
>+
>+- Adapt ncurses menu.ycp for running yast modules as separate 
>+  processes 
>+- Do not tamper with LANG and LC_CTYPE when stdin does not support
>+  utf8 (testutf8 returns 0)
>+
>+-------------------------------------------------------------------
> Tue Nov 28 09:04:31 CET 2006 - jsrain@suse.cz
> 
> - fixed board detection on PPC (#223872)

Actions: View

Attachments on bug 148683: 66861 | 108513 | 108514 | 108515