Mailinglist Archive: yast-commit (1914 mails)

< Previous Next >
[yast-commit] r58537 - in /trunk/installation/src: include/inst_inc_second.ycp inst_finish/installation_settings_finish.ycp modules/InstData.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Fri, 04 Sep 2009 16:28:41 -0000
  • Message-id: <E1MjbeT-0000yw-Id@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Fri Sep 4 18:28:41 2009
New Revision: 58537

URL: http://svn.opensuse.org/viewcvs/yast?rev=58537&view=rev
Log:
Write disabled subproposals at the end of 1st stage,
read them in the beginning of 2nd stage

Modified:
trunk/installation/src/include/inst_inc_second.ycp
trunk/installation/src/inst_finish/installation_settings_finish.ycp
trunk/installation/src/modules/InstData.ycp

Modified: trunk/installation/src/include/inst_inc_second.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_second.ycp?rev=58537&r1=58536&r2=58537&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_second.ycp (original)
+++ trunk/installation/src/include/inst_inc_second.ycp Fri Sep 4 18:28:41 2009
@@ -80,6 +80,32 @@
y2milestone ("Disabled proposals set to %1",
ProductControl::GetDisabledProposals());
}

+ void AdjustDisabledSubProposals () {
+ if (InstData::wizardsteps_disabled_subproposals == nil) {
+ y2error ("Disabled subproposals file not defined");
+ return;
+ }
+
+ if (! FileUtils::Exists (InstData::wizardsteps_disabled_subproposals)) {
+ y2milestone ("File %1 doesn't exist, skipping...",
InstData::wizardsteps_disabled_subproposals);
+ return;
+ }
+
+ map <string, list <string> > disabled_subproposals = (map <string, list
<string> >) SCR::Read (.target.ycp,
InstData::wizardsteps_disabled_subproposals);
+ if (disabled_subproposals == nil) {
+ y2error ("Error reading %1",
InstData::wizardsteps_disabled_subproposals);
+ return;
+ }
+
+ foreach (string unique_id, list<string> subproposals,
disabled_subproposals, {
+ foreach (string one_subproposal, subproposals, {
+ ProductControl::DisableSubProposal (unique_id, one_subproposal);
+ });
+ });
+
+ y2milestone ("Disabled AC items set to %1",
ProductControl::GetDisabledSubProposals());
+ }
+
void AdjustDisabledACItems () {
if (InstData::wizardsteps_disabled_ac_items == nil) {
y2error ("Disabled AC items file not defined");
@@ -109,6 +135,7 @@
void AdjustDisabledItems () {
AdjustDisabledModules();
AdjustDisabledProposals();
+ AdjustDisabledProposals();
AdjustDisabledACItems();
}


Modified: trunk/installation/src/inst_finish/installation_settings_finish.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/installation_settings_finish.ycp?rev=58537&r1=58536&r2=58537&view=diff
==============================================================================
--- trunk/installation/src/inst_finish/installation_settings_finish.ycp
(original)
+++ trunk/installation/src/inst_finish/installation_settings_finish.ycp Fri Sep
4 18:28:41 2009
@@ -62,6 +62,16 @@
}

y2milestone (
+ "Writing disabled subproposals %1 into %2",
+ ProductControl::GetDisabledSubProposals(),
+ InstData::wizardsteps_disabled_subproposals
+ );
+
+ if ((boolean) SCR::Write (.target.ycp,
InstData::wizardsteps_disabled_subproposals,
ProductControl::GetDisabledSubProposals()) != true) {
+ y2error ("Cannot write disabled subproposals");
+ }
+
+ y2milestone (
"Writing disabled AC items %1 into %2",
ProductControl::GetDisabledACItems(),
InstData::wizardsteps_disabled_ac_items

Modified: trunk/installation/src/modules/InstData.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=58537&r1=58536&r2=58537&view=diff
==============================================================================
--- trunk/installation/src/modules/InstData.ycp (original)
+++ trunk/installation/src/modules/InstData.ycp Fri Sep 4 18:28:41 2009
@@ -43,6 +43,7 @@
// see bnc #364066
global string wizardsteps_disabled_modules = Directory::vardir +
"/installation_disabled_steps";
global string wizardsteps_disabled_proposals = Directory::vardir +
"/installation_disabled_proposals";
+ global string wizardsteps_disabled_subproposals = Directory::vardir +
"/installation_disabled_subproposals";
global string wizardsteps_disabled_ac_items = Directory::vardir +
"/installation_disabled_acs";

// temporary variables for disabling and enabling steps

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages