Author: ug Date: Mon Jul 25 10:07:11 2011 New Revision: 64974 URL: http://svn.opensuse.org/viewcvs/yast?rev=64974&view=rev Log: notification option for scripts added (fate#312674) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstScripts.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes?rev=64974&r1=64973&r2=64974&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Mon Jul 25 10:07:11 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 25 10:06:25 CEST 2011 - ug@suse.de + +- notification option for scripts added (fate#312674) + +------------------------------------------------------------------- Fri Jul 22 09:54:01 CEST 2011 - ug@suse.de - passing a type=boolean to an ask-script via $VAL did not work Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstScripts.ycp?rev=64974&r1=64973&r2=64974&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstScripts.ycp Mon Jul 25 10:07:11 2011 @@ -137,6 +137,7 @@ "source":p["source"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, + "notification":p["notification"]:"", "debug":p["debug"]:true ]); }); @@ -147,6 +148,7 @@ "location":p["location"]:"", "feedback":p["feedback"]:false, "debug":p["debug"]:true, + "notification":p["notification"]:"", "network_needed":p["network_needed"]:false ] ); @@ -158,6 +160,7 @@ "chrooted":p["chrooted"]:false, "location":p["location"]:"", "feedback":p["feedback"]:false, + "notification":p["notification"]:"", "debug":p["debug"]:true ]); }); @@ -317,6 +320,7 @@ string source, string interpreter, string type, + string notification, boolean chrooted, boolean debug, boolean feedback, @@ -337,6 +341,7 @@ oldScript=add(oldScript,"debug",debug); oldScript=add(oldScript,"feedback",feedback); oldScript=add(oldScript,"network_needed",network); + oldScript=add(oldScript,"notification", notification); mod = true; return oldScript; @@ -357,6 +362,7 @@ script=add(script,"debug",debug); script=add(script,"feedback",feedback); script=add(script,"network_needed",network); + script=add(script,"notification", notification); merged=add(merged,script); } @@ -684,6 +690,9 @@ string executionString = ""; boolean showFeedback = s["feedback"]:false; + if( s["notification"]:"" != "" ) + Popup::ShowFeedback( "", s["notification"]:"" ); + if (scriptInterpreter == "shell") { string debug = ( s["debug"]:true ? "-x" : "" ); @@ -731,6 +740,9 @@ } string feedback = ""; + if( s["notification"]:"" != "" ) + Popup::ClearFeedback(); + if( executionString != "" ) { if( showFeedback ) { feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org