Author: jsuchome Date: Tue Dec 9 13:44:55 2008 New Revision: 53996 URL: http://svn.opensuse.org/viewcvs/yast?rev=53996&view=rev Log: - menu.ycp: do not wait for integer return value of YOU (bnc#457167) - 2.17.59 Modified: trunk/yast2/VERSION trunk/yast2/library/agents/ag_anyxml trunk/yast2/library/desktop/src/menu.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=53996&r1=53995&r2=53996&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Dec 9 13:44:55 2008 @@ -1 +1 @@ -2.17.58 +2.17.59 Modified: trunk/yast2/library/agents/ag_anyxml URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/agents/ag_anyxml?rev=53996&r1=53995&r2=53996&view=diff ============================================================================== --- trunk/yast2/library/agents/ag_anyxml (original) +++ trunk/yast2/library/agents/ag_anyxml Tue Dec 9 13:44:55 2008 @@ -33,7 +33,7 @@ # Non-default write options could be used by passing extra submap with # "args" key in the write map: # -# SCR::Write (.anyxml, $[ "file": "c.xml", "xml" : conf, "args: $[ +# SCR::Write (.anyxml, $[ "file": "c.xml", "xml" : conf, "args": $[ # "XMLDecl" : <?xml version="123456789"?>, # "RootName" : "test" # ]); Modified: trunk/yast2/library/desktop/src/menu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/src/menu.ycp?rev=53996&r1=53995&r2=53996&view=diff ============================================================================== --- trunk/yast2/library/desktop/src/menu.ycp (original) +++ trunk/yast2/library/desktop/src/menu.ycp Tue Dec 9 13:44:55 2008 @@ -25,6 +25,8 @@ boolean root = false; string restart_file = Directory::vardir + "/restart_menu"; +// file existing if yast2-online-update wants to be restarted +string restart_you = Directory::vardir + "/selected_patches.ycp"; /** */ @@ -121,7 +123,8 @@ } y2milestone ("Got %1 from %2", ret, cmd); - if ((function == "online_update" && ret == -42) ) + if (function == "online_update" && ret != `cancel && ret != `abort && + FileUtils::Exists (restart_you)) { y2milestone ("yast needs to be restarted - exiting..."); SCR::Execute (.target.bash, sformat ("touch %1", restart_file)); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=53996&r1=53995&r2=53996&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Dec 9 13:44:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 8 12:33:02 CET 2008 - jsuchome@suse.cz + +- menu.ycp: do not wait for integer return value of YOU (bnc#457167) +- 2.17.59 + +------------------------------------------------------------------- Fri Dec 5 15:32:57 CET 2008 - lslezak@suse.cz - PackagesUI.ycp - properly pass the mode parameter to the packager -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org