[yast-commit] r46116 - in /trunk/installation: ./ package/ src/clients/

4 Apr 2008

Author: locilka
Date: Fri Apr  4 17:03:18 2008
New Revision: 46116

URL: http://svn.opensuse.org/viewcvs/yast?rev=46116&view=rev
Log:
- Improved user-feedback during automatic configuration.
- 2.16.30


Modified:
    trunk/installation/VERSION
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_automatic_configuration.ycp
    trunk/installation/src/clients/inst_initialization.ycp
    trunk/installation/src/clients/inst_suseconfig.ycp
    trunk/installation/yast2-installation.spec.in

Modified: trunk/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================

--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Fri Apr  4 17:03:18 2008
@@ -1 +1 @@
-2.16.29
+2.16.30

Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Fri Apr  4 17:03:18 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Apr  4 17:02:23 CEST 2008 - locilka@suse.cz
+
+- Improved user-feedback during automatic configuration.
+- 2.16.30
+
+-------------------------------------------------------------------
 Fri Apr  4 14:06:22 CEST 2008 - jsrain@suse.cz
 
 - added restart handling for live installation

Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_automatic_configuration.ycp (original)
+++ trunk/installation/src/clients/inst_automatic_configuration.ycp Fri Apr  4 17:03:18 2008
@@ -15,6 +15,8 @@
     import "FileUtils";
     import "Directory";
     import "GetInstArgs";
+    import "Progress";
+    import "Wizard";
 
     textdomain "installation";
 
@@ -32,21 +34,34 @@
 // (at least the list of modules in proposals)
     list  > proposal_scripts_to_call = [
 	// probably needed
-	$[ "type":"scripts",   "items":["initialization", "netprobe", "rpmcopy_secondstage"] ],
+	$[
+	    "label":_("Initialization..."),
+	    "type":"scripts",
+	    "items":["initialization", "netprobe", "rpmcopy_secondstage"]
+	],
+
 	// network proposal
-	$[ "type":"proposals", "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"] ],
+	$[
+	    "label":_("Configuring network..."),
+	    "type":"proposals",
+	    "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"]
+	],
+
 	// hardware proposal
-	$[ "type":"proposals", "items":["x11", "printer", "sound", "tv"] ],
+	$[
+	    "label":_("Configuring hardware..."),
+	    "type":"proposals",
+	    "items":["x11", "printer", "sound", "tv"]
+	],
+
 	// probably needed
-	$[ "type":"scripts",   "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] ],
+	$[
+	    "label":_("Finishing configuration..."),
+	    "type":"scripts",
+	    "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"]
+	],
     ];
 
-// users will be called if there is anything to write
-//    if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) {
-//	y2milestone ("Users will be called");
-//	proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]);
-//    }
-
     /**
      * Prepares the list of installation scripts to be executed.
      * This comes from control file where scripts are mentioned without the leading
@@ -87,29 +102,93 @@
 	return ret_names;
     }
 
-    void CallScripts (list <string> scripts_to_call) {
+    void HandleExceptions (string proposal_name) {
+	if (proposal_name == "x11_proposal" || proposal_name == "x11") {
+	    if (! UI::TextMode()) {
+		y2milestone ("Printing >don't panic 0 && current_sub_step > 0 && nr_of_sub_steps >= current_sub_step) {
+	    progress_title = sformat (
+		// TRANSLATORS: Progress step label
+		//	%1 - text defined by script, e.g., "Configuring hardware..."
+		//	%2 - number of the current step
+		//	%3 - number of all steps
+		//	Finally, it might look like this "Configuring hardware... (2/5)"
+		_("%1 (%2/%3)"),
+		progress_title,
+		current_sub_step,
+		nr_of_sub_steps
+	    );
+	}
+
+	Progress::Title (progress_title);
+	Progress::Step (current_step);
+    }
+
+    void CallScripts (list <string> scripts_to_call, string progress_title) {
 	y2milestone ("Scripts to call: %1", scripts_to_call);
 
 	scripts_to_call = NormalizeScriptNames (scripts_to_call);
+	// every single script has one step
+	ResetSubSteps (size (scripts_to_call));
 
 	foreach (string one_script, scripts_to_call, {
 	    y2milestone ("Calling script %1", one_script);
-	    any result = WFM::CallFunction (one_script, [ $["WriteOnly":true, "AutomaticConfiguration":true] ]);
+	    NextStep (progress_title);
+	    boolean progress_before = Progress::set (false);
+
+	    any result = WFM::CallFunction (one_script, [ $["AutomaticConfiguration":true] ]);
+
+	    Progress::set (progress_before);
 	    y2milestone ("Script %1 returned %2", one_script, result);
 	});
     }
 
-    void CallProposals (list <string> proposals_to_call) {
+    void CallProposals (list <string> proposals_to_call, string progress_title) {
 	y2milestone ("Scripts to call: %1", proposals_to_call);
 
 	proposals_to_call = NormalizeProposalNames (proposals_to_call);
-
-	// $[ "WriteOnly":true ] used to determine that we just want to write the proposed
-	// configuration, we don't want to (re)start anything (network, cups, firewall, ...)
+	// every single proposal has two steps
+	ResetSubSteps (2 * size (proposals_to_call));
 
 	foreach (string one_proposal, proposals_to_call, {
 	    y2milestone ("Calling script %1 MakeProposal", one_proposal);
+	    NextStep (progress_title);
+	    boolean progress_before = Progress::set (false);
+
+	    HandleExceptions (one_proposal);
 	    any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]);
+
+	    Progress::set (progress_before);
 	    y2milestone ("Script %1 returned %2", one_proposal, result);
 	});
 
@@ -122,26 +201,57 @@
 
 	foreach (string one_proposal, proposals_to_call, {
 	    y2milestone ("Calling script %1 Write", one_proposal);
+	    NextStep (progress_title);
+	    boolean progress_before = Progress::set (false);
+
 	    any result = WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]);
+
+	    Progress::set (progress_before);
 	    y2milestone ("Script %1 returned %2", one_proposal, result);
 	});
     }
 
+    integer nr_of_steps = 0;
+
+    foreach (map one_autoconf_call, proposal_scripts_to_call, {
+	nr_of_steps = nr_of_steps +
+	    // Proposals have two steps, scripts only one
+	    ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[]));
+    });
+
+    Progress::Simple(
+	_("Automatic Configuration"),
+	"",
+	nr_of_steps,
+	_("<p>Installation is currently writing the automatic configuration. Please wait...</p>")
+    );
+
     foreach (map one_autoconf_call, proposal_scripts_to_call, {
 	string type = one_autoconf_call["type"]:"";
 
+	string progress_title = one_autoconf_call["label"]:_("Automatic configuration...");
+
 	switch (type) {
 	    case "scripts":
-		CallScripts (one_autoconf_call["items"]:[]);
+		CallScripts (one_autoconf_call["items"]:[], progress_title);
 		break;
 	    case "proposals":
-		CallProposals (one_autoconf_call["items"]:[]);
+		CallProposals (one_autoconf_call["items"]:[], progress_title);
 		break;
 	    y2error ("Unknown script type '%1'", type);
 	}
     });
 
+    Progress::Finish();
+
     y2milestone ("automatic_configuration finished");
 
+    Wizard::SetContents (
+	_("Automatic Configuration"),
+	`Label (_("Finishing configuration...")),
+	"",
+	false, false
+    );
+
     return `auto;
 }

Modified: trunk/installation/src/clients/inst_initialization.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_initialization.ycp?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_initialization.ycp (original)
+++ trunk/installation/src/clients/inst_initialization.ycp Fri Apr  4 17:03:18 2008
@@ -18,6 +18,12 @@
 
 import "Wizard";
 import "Stage";
+import "GetInstArgs";
+
+if (GetInstArgs::automatic_configuration()) {
+    y2milestone ("Automatic configuration...");
+    return `auto;
+}
 
 // TRANSLATORS: dialog help
 string helptext = _("Please wait while the installation is being initialized.");

Modified: trunk/installation/src/clients/inst_suseconfig.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_suseconfig.ycp?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_suseconfig.ycp (original)
+++ trunk/installation/src/clients/inst_suseconfig.ycp Fri Apr  4 17:03:18 2008
@@ -27,22 +27,17 @@
     import "Wizard";
     import "Kernel";
     import "GetInstArgs";
+
     // bugzilla #241553 comment #7
     // import "Product"; // ugly, because of initializing the &product; macro
 
     if ( GetInstArgs::going_back())	// going backwards?
 	return `auto;			// don't execute this once more
 
-    map param = $[];
-    if (size (WFM::Args()) > 0 && is (WFM::Args (0), map))
-	param = (map) WFM::Args (0);
-
-    boolean automatic_configuration = false;
-    if (param["AutomaticConfiguration"]:false == true) {
-	automatic_configuration = true;
-    }
-
-    y2milestone ("Script params: %1, AutoConf: %2", param, automatic_configuration);
+    // automatic configuration has its own progress
+    // do not set an UI if possible
+    boolean automatic_configuration = GetInstArgs::automatic_configuration();
+    y2milestone ("Script AutoConf: %1", automatic_configuration);
 
     boolean reread_inittab = false;
 

Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=46116&r1=46115&r2=46116&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Fri Apr  4 17:03:18 2008
@@ -9,8 +9,8 @@
 
 Requires:       autoyast2-installation
 
-# Installation::run_update_file
-Requires:	yast2 >= 2.16.36
+# GetInstArgs::automatic_configuration
+Requires:	yast2 >= 2.16.46
 
 # Required in in the first stage, after
 # switching to the installed system, bugzilla #249679

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r46116 - in /trunk/installation: ./ package/ src/clients/

locilka＠svn.opensuse.org