Author: locilka
Date: Mon Oct 6 15:45:51 2008
New Revision: 51871
URL: http://svn.opensuse.org/viewcvs/yast?rev=51871&view=rev
Log:
- Do not display any system type for SLES/SLED in installation
overview (bnc #431336).
- Clients inst_new_desktop and inst_scenarios converted to use
PackagesProposal API instead of using Pkg calls directly (bnc
#432572)
- Dropping obsolete inst_software_selection client instead of
convwerting it - not in use anymore (bnc #432572).
- 2.17.18
Removed:
trunk/installation/src/clients/inst_software_selection.ycp
Modified:
trunk/installation/VERSION
trunk/installation/control/control.SLED.xml
trunk/installation/control/control.SLES.xml
trunk/installation/control/control.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_mode.ycp
trunk/installation/src/clients/inst_new_desktop.ycp
trunk/installation/src/clients/inst_scenarios.ycp
trunk/installation/yast2-installation.spec.in
Modified: trunk/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Mon Oct 6 15:45:51 2008
@@ -1 +1 @@
-2.17.17
+2.17.18
Modified: trunk/installation/control/control.SLED.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/control/control.SLED.xml (original)
+++ trunk/installation/control/control.SLED.xml Mon Oct 6 15:45:51 2008
@@ -195,7 +195,6 @@
<packages>gdm</packages>
<order config:type="integer">1</order>
<patterns>gnome x11 base</patterns>
- <icon>pattern-gnome</icon>
@@ -256,7 +255,8 @@
</label>
</congratulate>
- <label>GNOME</label>
+ <!-- BNC #431336, Do not display any system type -->
+ <label></label>
<label>Initialization...</label>
<label>Configuring network...</label>
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Mon Oct 6 15:45:51 2008
@@ -153,7 +153,7 @@
<name>desktop_for_scenarios</name>
<desktop>gnome</desktop>
- desktop_for_scenarios
+ dummy_desktop
<logon>gdm</logon>
<cursor>DMZ</cursor>
<order config:type="integer">1</order>
@@ -167,7 +167,7 @@
<name>desktop_gnome</name>
<desktop>gnome</desktop>
- desktop_gnome
+ dummy_desktop
<logon>gdm</logon>
<cursor>DMZ</cursor>
<packages>gdm</packages>
@@ -243,10 +243,8 @@
</label>
</congratulate>
- <!-- Empty string is intentional, bnc #431251, there needn't be any desktop -->
- <label></label>
- <!-- Default desktop for non-i386/non-x86_64 machines -->
- <label>GNOME</label>
+ <!-- Empty string is intentional, bnc #431251, bnc #431336 -->
+ <label></label>
<!-- FATE #304373: Server scenarios -->
<label>Server Base Scenario</label>
Modified: trunk/installation/control/control.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/control/control.xml (original)
+++ trunk/installation/control/control.xml Mon Oct 6 15:45:51 2008
@@ -269,8 +269,8 @@
</arguments>
</module>
<module>
- <label>Software Selection</label>
- <name>software_selection</name>
+ <label>Desktop Selection</label>
+ <name>new_desktop</name>
yes
yes
</module>
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Oct 6 15:45:51 2008
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon Oct 6 15:30:53 CEST 2008 - locilka@suse.cz
+
+- Do not display any system type for SLES/SLED in installation
+ overview (bnc #431336).
+- Clients inst_new_desktop and inst_scenarios converted to use
+ PackagesProposal API instead of using Pkg calls directly (bnc
+ #432572)
+- Dropping obsolete inst_software_selection client instead of
+ convwerting it - not in use anymore (bnc #432572).
+- 2.17.18
+
+-------------------------------------------------------------------
Fri Oct 3 16:31:10 CEST 2008 - locilka@suse.cz
- Enabling some steps in second stage even if Automatic
Modified: trunk/installation/src/clients/inst_mode.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_mode.ycp (original)
+++ trunk/installation/src/clients/inst_mode.ycp Mon Oct 6 15:45:51 2008
@@ -30,6 +30,7 @@
import "Wizard";
import "ProductFeatures";
import "Directory";
+import "PackagesProposal";
include "packager/storage_include.ycp";
include "installation/misc.ycp";
@@ -457,6 +458,7 @@
Kernel::ProbeKernel();
Pkg::TargetFinish ();
Pkg::PkgReset ();
+ PackagesProposal::ResetAll();
Packages::Init( true );
ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false);
Modified: trunk/installation/src/clients/inst_new_desktop.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_new_desktop.ycp?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_new_desktop.ycp (original)
+++ trunk/installation/src/clients/inst_new_desktop.ycp Mon Oct 6 15:45:51 2008
@@ -23,6 +23,7 @@
import "Stage";
import "Directory";
import "ProductControl";
+import "PackagesProposal";
// do not offer the dialog if base selection is fixed
if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed)
@@ -46,17 +47,22 @@
map all_desktops = DefaultDesktop::GetAllDesktopsMap();
+string packages_proposal_ID = "inst_new_desktop";
+
void SelectSoftwareNow () {
y2milestone ("Selected desktop: %1", DefaultDesktop::Desktop());
DefaultDesktop::SetDesktop (DefaultDesktop::Desktop());
Packages::ForceFullRepropose();
- Packages::Reset ([`product]);
- foreach (string one_pattern, (list <string>) all_desktops[DefaultDesktop::Desktop(), "patterns"]:[], {
- y2milestone ("Marking desktop pattern to be installed: %1", one_pattern);
- Pkg::ResolvableInstall (one_pattern, `pattern);
- });
+ // Remove all already selected patterns
+ PackagesProposal::RemoveResolvables (packages_proposal_ID, `pattern,
+ PackagesProposal::GetResolvables (packages_proposal_ID, `pattern)
+ );
+
+ PackagesProposal::AddResolvables (
+ packages_proposal_ID, `pattern, all_desktops[DefaultDesktop::Desktop(), "patterns"]:[]
+ );
}
string GetDesktopRadioButtonId (string desktop_name) {
@@ -255,12 +261,17 @@
Select the default type."));
continue;
}
- DefaultDesktop::SetDesktop (regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1"));
- if (DefaultDesktop::Desktop() != nil && haskey (all_desktops, DefaultDesktop::Desktop())) {
- SelectSoftwareNow ();
- break;
+ if (currently_selected != nil && currently_selected != "") {
+ DefaultDesktop::SetDesktop (regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1"));
+ Packages::ForceFullRepropose();
+
+ if (DefaultDesktop::Desktop() != nil && haskey (all_desktops, DefaultDesktop::Desktop())) {
+ SelectSoftwareNow ();
+ break;
+ }
}
+
Popup::Message (_("No system type was selected.
Select the default type."));
continue;
Modified: trunk/installation/src/clients/inst_scenarios.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_scenarios.ycp?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_scenarios.ycp (original)
+++ trunk/installation/src/clients/inst_scenarios.ycp Mon Oct 6 15:45:51 2008
@@ -22,6 +22,7 @@
import "Report";
import "Packages";
import "DefaultDesktop";
+ import "PackagesProposal";
boolean test_mode = false;
@@ -95,38 +96,32 @@
}
}
+ string packages_proposal_ID = "inst_scenarios";
+
void SelectPatterns (string chosen_selection) {
y2milestone ("User selected: %1", chosen_selection);
- // neutralize 'the other' patterns selected by application
- foreach (map one_scenario, system_scenarios, {
- if (one_scenario["id"]:"---" != chosen_selection) {
- foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), {
- y2milestone ("Neutralizing pattern: %1", one_pattern);
- // false -- only patterns in `selected stage APPL_HIGH will be neutralized
- Pkg::ResolvableNeutral (one_pattern, `pattern, false);
- });
- }
- });
+ Packages::ForceFullRepropose();
+
+ // Remove all already selected patterns
+ PackagesProposal::RemoveResolvables (packages_proposal_ID, `pattern,
+ PackagesProposal::GetResolvables (packages_proposal_ID, `pattern)
+ );
// select newly selected patterns for installation
foreach (map one_scenario, system_scenarios, {
if (one_scenario["id"]:"---" == chosen_selection) {
list <string> patterns_to_install = splitstring (one_scenario["patterns"]:"", " \t");
-
- foreach (string one_pattern, patterns_to_install, {
- y2milestone ("Selecting pattern: %1", one_pattern);
- Pkg::ResolvableInstall (one_pattern, `pattern);
- });
-
- Packages::required_patterns = patterns_to_install;
- y2milestone ("Packages::required_patterns: %1", Packages::required_patterns);
+ // Select new list of patterns
+ PackagesProposal::AddResolvables (packages_proposal_ID, `pattern, patterns_to_install);
+ break;
}
});
string desktop = ProductFeatures::GetStringFeature ("software", "scenarios_desktop");
y2milestone ("Using default desktop: %1", desktop);
DefaultDesktop::SetDesktop (desktop);
+ Packages::ForceFullRepropose();
}
// adjusting test mode - not used in installation
@@ -135,9 +130,9 @@
Pkg::TargetInit (Installation::destdir, true);
Pkg::SourceStartManager (true);
// pre-select
-// foreach (string one_pattern, splitstring (system_scenarios[0,"patterns"]:"", " \t"), {
-// Pkg::ResolvableInstall (one_pattern, `pattern);
-// });
+ foreach (string one_pattern, splitstring (system_scenarios[0,"patterns"]:"", " \t"), {
+ Pkg::ResolvableInstall (one_pattern, `pattern);
+ });
Pkg::PkgSolve (true);
}
Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Mon Oct 6 15:45:51 2008
@@ -13,8 +13,8 @@
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
-# (public) ProductControl::InitAutomaticConfiguration
-Requires: yast2 >= 2.17.7
+# PackagesProposal with `pattern(s)
+Requires: yast2 >= 2.17.38
# 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
