Author: locilka Date: Wed Apr 30 10:30:15 2008 New Revision: 47189 URL: http://svn.opensuse.org/viewcvs/yast?rev=47189&view=rev Log: - Making automatic installation more robust (bnc #384972). - 2.16.42 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=47189&am... ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Apr 30 10:30:15 2008 @@ -1 +1 @@ -2.16.41 +2.16.42 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-instal... ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 30 10:30:15 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 10:24:19 CEST 2008 - locilka@suse.cz + +- Making automatic installation more robust (bnc #384972). +- 2.16.42 + +------------------------------------------------------------------- Tue Apr 29 12:59:49 CEST 2008 - locilka@suse.cz - Disabling Progress when calling inst_finish scripts. Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_aut... ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Wed Apr 30 10:30:15 2008 @@ -140,8 +140,15 @@ current_sub_step = current_sub_step + 1; current_step = current_step + 1; - UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step); - UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step); + if (UI::WidgetExists (`id ("one_set_progress"))) + UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step); + else + y2error ("Widget one_set_progress doesn't exist"); + + if (UI::WidgetExists (`id ("autoconf_progress"))) + UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step); + else + y2error ("Widget autoconf_progress doesn't exist"); } void DummyFunction () { @@ -251,18 +258,28 @@ foreach (map one_autoconf_call, proposal_scripts_to_call, { string type = one_autoconf_call["type"]:""; + integer nr_of_steps = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])); + string label = one_autoconf_call["label"]:_("Automatic configuration..."); + + y2milestone ("Steps: %1, Label: %2", nr_of_steps, label); + // reset the faster prgress current_sub_step = 0; - UI::ReplaceWidget (`id ("rp_one_set_progress"), - `ProgressBar ( - `id ("one_set_progress"), - one_autoconf_call["label"]:_("Automatic configuration..."), - ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])), - 0 - ) - ); - y2milestone ("Steps: %1", ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[]))); - y2milestone ("Label: %1", one_autoconf_call["label"]:_("Automatic configuration...")); + if (UI::WidgetExists (`id ("rp_one_set_progress"))) { + UI::ReplaceWidget (`id ("rp_one_set_progress"), + `ProgressBar ( + `id ("one_set_progress"), + label, + nr_of_steps, + 0 + ) + ); + } else { + y2error ("Widget rp_one_set_progress doesn't exist! Cannot provide useful progress..."); + y2warning ("---------------------- UI DUMP ----------------------"); + UI::DumpWidgetTree(); + y2warning ("---------------------- UI DUMP ----------------------"); + } switch (type) { case "scripts": -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org