Author: locilka Date: Tue Mar 18 13:25:14 2008 New Revision: 45549 URL: http://svn.opensuse.org/viewcvs/yast?rev=45549&view=rev Log: - Changed the default value for use-automatic-configuration in ProductControl module, now it's false (Also because of AutoYaST). - Better logging. - 2.16.38 Modified: trunk/yast2/VERSION trunk/yast2/library/control/src/ProductControl.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=45549&r1=45548&r2=45549&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Mar 18 13:25:14 2008 @@ -1 +1 @@ -2.16.37 +2.16.38 Modified: trunk/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/ProductControl.ycp?rev=45549&r1=45548&r2=45549&view=diff ============================================================================== --- trunk/yast2/library/control/src/ProductControl.ycp (original) +++ trunk/yast2/library/control/src/ProductControl.ycp Tue Mar 18 13:25:14 2008 @@ -615,6 +615,12 @@ global void UnDisableAllModulesAndProposals (string mode, string stage) { map this_workflow = $["mode":mode, "stage":stage]; + // Such mode/stage not disabled + if (! contains (already_disabled_workflows, this_workflow)) { + y2milestone ("Not yet disabled, not un-disabling: %1", this_workflow); + return; + } + y2milestone ("Un-Disabling workflow %1", this_workflow); already_disabled_workflows = filter (map one_workflow, already_disabled_workflows, { return (one_workflow != this_workflow); @@ -747,8 +753,26 @@ // Installation without second stage // "Automatic Configuration" -// FIXME: read the default value from control file -boolean use_automatic_configuration = true; +boolean use_automatic_configuration = nil; + +/** + * Inits the default value for use_automatic_configuration + */ +void InitAutomaticConfiguration () { + if (use_automatic_configuration != nil) + return; + + // AytoYaST default - not to use Automatic configuration at all + if (Mode::autoinst() || Mode::config()) { + use_automatic_configuration = false; + // The rest is on user + // FIXME: read the default value from control file + } else { + use_automatic_configuration = false; + } + + y2milestone ("Default 'UseAutomaticConfiguration': %1", use_automatic_configuration); +} /** * Adjust the automatic configuration to be either enabled or disabled. @@ -763,6 +787,8 @@ } use_automatic_configuration = set_param; + + y2milestone ("UseAutomaticConfiguration has been set to: %1", use_automatic_configuration); } /** @@ -771,6 +797,9 @@ * @return boolean if enabled */ global boolean GetUseAutomaticConfiguration () { + // lazy loading + InitAutomaticConfiguration(); + return use_automatic_configuration; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=45549&r1=45548&r2=45549&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Mar 18 13:25:14 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Mar 18 13:22:01 CET 2008 - locilka@suse.cz + +- Changed the default value for use-automatic-configuration in + ProductControl module, now it's false (Also because of AutoYaST). +- Better logging. +- 2.16.38 + +------------------------------------------------------------------- Mon Mar 17 14:50:16 CET 2008 - aschnell@suse.de - added LogViewCore.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org