Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Oct 8 18:45:59 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-10-02 13:43:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-10-08 12:58:43.000000000 +0200
@@ -1,0 +2,53 @@
+Wed Oct 08 12:51:01 CEST 2008 - aschnell@suse.de
+
+- removed cp of proc/mounts to /etc/mtab (bnc #425464)
+- 2.17.19
+
+-------------------------------------------------------------------
+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).
+- Always change initial proposal [Next] button to [Install],
+ resp. [Update] (bnc #431567).
+- Removing desktop definitions and default_desktop from SLED
+ control file, the required patterns are selected by PATTERNS
+ in content file already (bnc #431902).
+- Adding lnussel's patch for desktop_finish to write
+ POLKIT_DEFAULT_PRIVS if defined in globals->polkit_default_privs
+ (bnc #431158).
+- Adding polkit_default_privs="restrictive" for SLES (bnc #431158).
+- 2.17.18
+
+-------------------------------------------------------------------
+Fri Oct 3 16:31:10 CEST 2008 - locilka@suse.cz
+
+- Enabling some steps in second stage even if Automatic
+ Configuration is in use.
+- Feature added into openSUSE and SLED control files
+ (both bnc #428190).
+
+-------------------------------------------------------------------
+Thu Oct 2 22:00:46 CEST 2008 - mzugec@suse.de
+
+- changed Release Notes into Support group (bnc#430005)
+
+-------------------------------------------------------------------
+Thu Oct 2 19:13:07 CEST 2008 - locilka@suse.cz
+
+- Adjusted presentation_order for SLES and SLED installation
+ proposals - software has to be proposed as almost the last one
+ (bnc #431580).
+
+-------------------------------------------------------------------
+Thu Oct 2 14:00:49 CEST 2008 - locilka@suse.cz
+
+- Added 'default_ntp_setup' into control files (SLES/D: false,
+ openSUSE: true) (bnc #431259).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.17.tar.bz2
New:
----
yast2-installation-2.17.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ws2966/_old 2008-10-08 18:44:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ws2966/_new 2008-10-08 18:44:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.17)
+# spec file for package yast2-installation (Version 2.17.19)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.17
+Version: 2.17.19
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.17.tar.bz2
+Source0: yast2-installation-2.17.19.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -33,8 +33,8 @@
BuildRequires: yast2-packager >= 2.17.9
# 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
Requires: yast2-bootloader
@@ -114,7 +114,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.17
+%setup -n yast2-installation-2.17.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -183,6 +183,41 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Wed Oct 08 2008 aschnell@suse.de
+- removed cp of proc/mounts to /etc/mtab (bnc #425464)
+- 2.17.19
+* Mon Oct 06 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).
+- Always change initial proposal [Next] button to [Install],
+ resp. [Update] (bnc #431567).
+- Removing desktop definitions and default_desktop from SLED
+ control file, the required patterns are selected by PATTERNS
+ in content file already (bnc #431902).
+- Adding lnussel's patch for desktop_finish to write
+ POLKIT_DEFAULT_PRIVS if defined in globals->polkit_default_privs
+ (bnc #431158).
+- Adding polkit_default_privs="restrictive" for SLES (bnc #431158).
+- 2.17.18
+* Fri Oct 03 2008 locilka@suse.cz
+- Enabling some steps in second stage even if Automatic
+ Configuration is in use.
+- Feature added into openSUSE and SLED control files
+ (both bnc #428190).
+* Fri Oct 03 2008 mzugec@suse.de
+- changed Release Notes into Support group (bnc#430005)
+* Thu Oct 02 2008 locilka@suse.cz
+- Adjusted presentation_order for SLES and SLED installation
+ proposals - software has to be proposed as almost the last one
+ (bnc #431580).
+* Thu Oct 02 2008 locilka@suse.cz
+- Added 'default_ntp_setup' into control files (SLES/D: false,
+ openSUSE: true) (bnc #431259).
* Thu Oct 02 2008 locilka@suse.cz
- Using two default desktops, one for inst_scenarios, another
one (default) while inst_scenarios not used (bnc #431251,
++++++ yast2-installation-2.17.17.tar.bz2 -> yast2-installation-2.17.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/configure new/yast2-installation-2.17.19/configure
--- old/yast2-installation-2.17.17/configure 2008-10-02 13:54:07.000000000 +0200
+++ new/yast2-installation-2.17.19/configure 2008-10-08 13:22:41.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.17.
+# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.17.17'
-PACKAGE_STRING='yast2-installation 2.17.17'
+PACKAGE_VERSION='2.17.19'
+PACKAGE_STRING='yast2-installation 2.17.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1208,7 +1208,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-installation 2.17.17 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.17.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1279,7 +1279,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.17.17:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.17.19:";;
esac
cat <<\_ACEOF
@@ -1357,7 +1357,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.17.17
+yast2-installation configure 2.17.19
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1371,7 +1371,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-installation $as_me 2.17.17, which was
+It was created by yast2-installation $as_me 2.17.19, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2192,7 +2192,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.17.17'
+ VERSION='2.17.19'
cat >>confdefs.h <<_ACEOF
@@ -2420,7 +2420,7 @@
-VERSION="2.17.17"
+VERSION="2.17.19"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3563,7 +3563,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.17.17, which was
+This file was extended by yast2-installation $as_me 2.17.19, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3606,7 +3606,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.17.17
+yast2-installation config.status 2.17.19
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/configure.in new/yast2-installation-2.17.19/configure.in
--- old/yast2-installation-2.17.17/configure.in 2008-10-02 13:54:04.000000000 +0200
+++ new/yast2-installation-2.17.19/configure.in 2008-10-08 13:22:38.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.17.17, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.17.19, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.17"
+VERSION="2.17.19"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/control/control.xml new/yast2-installation-2.17.19/control/control.xml
--- old/yast2-installation-2.17.17/control/control.xml 2008-09-05 11:54:11.000000000 +0200
+++ new/yast2-installation-2.17.19/control/control.xml 2008-10-06 13:13:39.000000000 +0200
@@ -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>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/control/docs/control-section.xml new/yast2-installation-2.17.19/control/docs/control-section.xml
--- old/yast2-installation-2.17.17/control/docs/control-section.xml 2008-09-18 13:02:10.000000000 +0200
+++ new/yast2-installation-2.17.19/control/docs/control-section.xml 2008-10-08 12:10:25.000000000 +0200
@@ -405,6 +405,16 @@
<listitem><para>(boolean) <emphasis>write_hostname_to_hosts</emphasis> - defines whether
the currently assigned hostname is written to /etc/hosts with IPv4 address 127.0.0.2.
Defaul value is <emphasis>false</emphasis> if not set.</para></listitem>
+
+ <!-- BNC #431259 -->
+ <listitem><para>(boolean) <emphasis>default_ntp_setup</emphasis> - NTP configuration
+ proposes a default ntp server if set to <emphasis>true</emphasis>. Default value
+ is <emphasis>false</emphasis>.</para></listitem>
+
+ <!-- BNC #431158 -->
+ <listitem><para>(string) <emphasis>polkit_default_privs</emphasis> - Adjusts
+ <emphasis>/etc/sysconfig/security/POLKIT_DEFAULT_PRIVS</emphasis> to the defined value.
+ If not set or empty, sysconfig is untouched.</para></listitem>
</itemizedlist>
</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/desktop_finish.ycp new/yast2-installation-2.17.19/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.17.17/src/clients/desktop_finish.ycp 2008-05-30 13:17:29.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/desktop_finish.ycp 2008-10-08 12:14:58.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: desktop_finish.ycp 47130 2008-04-28 15:51:10Z locilka $
+ * $Id: desktop_finish.ycp 51968 2008-10-08 10:15:01Z locilka $
*
*/
@@ -125,6 +125,7 @@
);
}
+ // this one should be obsolete nowadays but maybe KDE still uses it
string dm_shutdown = ProductFeatures::GetStringFeature ("globals",
"displaymanager_shutdown");
y2milestone ("Logon manager shutdown: %1", dm_shutdown);
@@ -134,6 +135,17 @@
dm_shutdown);
}
+ // bnc #431158, patch done by lnussel
+ string polkit_default_privs = ProductFeatures::GetStringFeature ("globals",
+ "polkit_default_privs");
+ if (polkit_default_privs != nil && polkit_default_privs != "")
+ {
+ y2milestone ("Writing %1 to POLKIT_DEFAULT_PRIVS", polkit_default_privs);
+ SCR::Write (.sysconfig.security.POLKIT_DEFAULT_PRIVS,
+ polkit_default_privs);
+ }
+
+
y2milestone ("sysconfig/displaymanager/DISPLAYMANAGER=%1", default_dm);
SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm);
SCR::Write (.sysconfig.displaymanager, nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/inst_mode.ycp new/yast2-installation-2.17.19/src/clients/inst_mode.ycp
--- old/yast2-installation-2.17.17/src/clients/inst_mode.ycp 2008-09-23 16:21:51.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/inst_mode.ycp 2008-10-06 15:45:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_mode.ycp 51415 2008-09-23 14:22:10Z locilka $
+ * $Id: inst_mode.ycp 51871 2008-10-06 13:45:51Z locilka $
*
*/
@@ -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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/inst_new_desktop.ycp new/yast2-installation-2.17.19/src/clients/inst_new_desktop.ycp
--- old/yast2-installation-2.17.17/src/clients/inst_new_desktop.ycp 2008-09-22 15:10:40.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/inst_new_desktop.ycp 2008-10-07 10:49:23.000000000 +0200
@@ -46,17 +46,14 @@
map all_desktops = DefaultDesktop::GetAllDesktopsMap();
-void SelectSoftwareNow () {
- y2milestone ("Selected desktop: %1", DefaultDesktop::Desktop());
- DefaultDesktop::SetDesktop (DefaultDesktop::Desktop());
+string packages_proposal_ID = "inst_new_desktop";
+void SelectSoftwareNow () {
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);
- });
+ y2milestone ("Selected desktop: %1", DefaultDesktop::Desktop());
+ // Sets PackagesProposal - packages to install
+ DefaultDesktop::SetDesktop (DefaultDesktop::Desktop());
}
string GetDesktopRadioButtonId (string desktop_name) {
@@ -255,12 +252,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;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/inst_proposal.ycp new/yast2-installation-2.17.19/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.17.17/src/clients/inst_proposal.ycp 2008-09-23 16:21:51.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/inst_proposal.ycp 2008-10-06 16:27:25.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 51415 2008-09-23 14:22:10Z locilka $
+ * $Id: inst_proposal.ycp 51878 2008-10-06 14:27:27Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -1129,16 +1129,16 @@
//
make_proposal( false, false );
- // Set keyboard focus to the [Install] / [Update] or [Next] button
- Wizard::SetFocusToNextButton();
- if (Stage::initial ())
- Wizard::SetNextButton (`next, (
- // FATE #120373
- Mode::update() ?
- _("&Update")
- :
- _("&Install")
- ));
+ void SetNextButton () {
+ if (Stage::initial () && proposal_mode == "initial")
+ Wizard::SetNextButton (`next, (
+ // FATE #120373
+ Mode::update() ?
+ _("&Update")
+ :
+ _("&Install")
+ ));
+ }
//
// Input loop
@@ -1146,9 +1146,16 @@
any input = nil;
+ // Set keyboard focus to the [Install] / [Update] or [Next] button
+ Wizard::SetFocusToNextButton();
+
while ( true )
{
richtext_normal_cursor(`id(`proposal ) );
+ // bnc #431567
+ // Some proposal module can change it while called
+ SetNextButton();
+
input = Wizard::UserInput();
y2milestone("Proposal - UserInput: '%1'", input);
richtext_busy_cursor(`id(`proposal ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/inst_scenarios.ycp new/yast2-installation-2.17.19/src/clients/inst_scenarios.ycp
--- old/yast2-installation-2.17.17/src/clients/inst_scenarios.ycp 2008-10-02 13:25:34.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/inst_scenarios.ycp 2008-10-07 14:21:10.000000000 +0200
@@ -22,6 +22,7 @@
import "Report";
import "Packages";
import "DefaultDesktop";
+ import "PackagesProposal";
boolean test_mode = false;
@@ -95,38 +96,25 @@
}
}
+ 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);
- });
- }
- });
-
// 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::SetResolvables (packages_proposal_ID, `pattern, patterns_to_install);
+ break;
}
});
- string desktop = ProductFeatures::GetStringFeature ("software", "scenarios_desktop");
- y2milestone ("Using default desktop: %1", desktop);
- DefaultDesktop::SetDesktop (desktop);
+ // conflicts with the default desktop feature, thus it removes
+ // the resolvables that the DefaultDesktop could require
+ y2warning ("Removing all default_desktop related resolvables...");
+ DefaultDesktop::SetDesktop (nil);
}
// adjusting test mode - not used in installation
@@ -135,9 +123,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);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.17/src/clients/inst_software_selection.ycp new/yast2-installation-2.17.19/src/clients/inst_software_selection.ycp
--- old/yast2-installation-2.17.17/src/clients/inst_software_selection.ycp 2008-05-30 13:17:29.000000000 +0200
+++ new/yast2-installation-2.17.19/src/clients/inst_software_selection.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,221 +0,0 @@
-/**
- * File: clients/inst_software_selection.ycp
- * Package: Installation
- * Summary: Replacement for Desktop Selection and Simple Pattern Selector
- * Authors: Lukas Ocilka
- *
- * $Id:$
- *
- */
-
-{
-
-textdomain "installation";
-
-import "ProductFeatures";
-import "InstData";
-import "GetInstArgs";
-import "DefaultDesktop";
-import "Wizard";
-import "Packages";
-import "Popup";
-import "Stage";
-import "Directory";
-import "Icon";
-
-// do not offer the dialog if base selection is fixed
-if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed)
- return `auto;
-
-boolean text_mode = UI::GetDisplayInfo()["TextMode"]:false;
-
-if (DefaultDesktop::Desktop() == nil || DefaultDesktop::Desktop() == "") {
- DefaultDesktop::Init();
-}
-
-// TRANSLATORS: help text, part 1
-string help = _("<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number
-of different desktop environments. Below you see a list of the 2 major ones
-<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a large number
-of desktop applications such as email, file browser, games and many others.</p>") +
-
-// TRANSLATORS: help text, part 2
-_("<p>As desktop selection is a matter of taste a clear <i>recommendation can't be
-given</i>.</p>") +
-
-// TRANSLATORS: help text, part 3
-_("Additionally, not only desktop but you can also chose a minimalistic
-installation that could fit your needs better.");
-
-map all_desktops = DefaultDesktop::GetAllDesktopsMap();
-
-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);
- });
-}
-
-string GetDesktopRadioButtonId (string desktop_name) {
- if (desktop_name == nil || desktop_name == "") {
- y2warning ("Wrong desktop name: %1", desktop_name);
- return "";
- }
-
- return sformat ("selected_desktop_%1", desktop_name);
-}
-
-term GetDesktops () {
- list <string> sort_order = maplist (string desktop_name, map one_desktop, all_desktops, {
- return desktop_name;
- });
-
- sort_order = sort (string x, string y, sort_order, ``(all_desktops[x,"order"]:99 < all_desktops[y,"order"]:99));
-
- term ret = `VBox ();
-
- integer counter = -1;
- integer last_desktop_order = -1;
-
- foreach (string desktop_name, sort_order, {
- counter = counter + 1;
- integer desktop_order = all_desktops[desktop_name,"order"]:99;
-
- y2milestone ("L: %1, C: %2", last_desktop_order, desktop_order);
- // bnc #379157
- // some space between 'Base' and 'Other' desktops
- if (last_desktop_order == 1 && desktop_order > 1) {
- ret[counter] = `VSpacing (1);
- counter = counter + 1;
- }
-
- ret[counter] =
- `Left (`HBox (
- `Image (Icon::IconPath(all_desktops[desktop_name,"icon"]:"yast"), ""),
- `HSpacing (2),
- `RadioButton (
- `id (GetDesktopRadioButtonId (desktop_name)),
- `opt (`notify),
- all_desktops[desktop_name,"label"]:""
- )
- ));
-
- last_desktop_order = desktop_order;
- });
-
- return ret;
-}
-
-void RedrawSelDesktopInfo (string currently_selected) {
- string description = "";
-
- if (currently_selected == nil || currently_selected == "") {
- y2milestone ("No desktop is currently selected");
-
- // TRANSLATORS: dialog hint
- description = _("Select a system to get its description.");
- } else {
- y2milestone ("Selected desktop: %1", currently_selected);
-
- list <string> desktop_patterns = all_desktops[currently_selected,"patterns"]:[];
- list