Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (794 mails)

< Previous Next >
commit yast2-installation for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Sep 2009 17:51:33 +0200
  • Message-id: <20090907155133.8381961FA@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation for
openSUSE:Factory
checked in at Mon Sep 7 17:51:33 CEST 2009.



--------
--- yast2-installation/yast2-installation.changes 2009-08-26
15:42:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes
2009-09-07 10:43:13.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Sep 4 19:00:27 CEST 2009 - kmachalkova@xxxxxxx
+
+- Introducing unique IDs to unambiguously identify AC steps and
+ sub-proposals
+- Writing disabled AC steps and subproposals at the end of 1st
+ stage, reading them back at the end of 2nd stage
+- Filtering out disabled AC steps from AC workflow (FaTE #303859 and
+ bnc#534862)
+- Require new yast2 base
+- 2.18.24
+
+-------------------------------------------------------------------
+Fri Sep 4 09:07:42 CEST 2009 - locilka@xxxxxxx
+
+- Dropped unnecessary fallback text from the fallback control file
+ (BNC #536288).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
yast2-installation-2.18.23.tar.bz2

New:
----
yast2-installation-2.18.24.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.cZei6c/_old 2009-09-07 17:51:24.000000000 +0200
+++ /var/tmp/diff_new_pack.cZei6c/_new 2009-09-07 17:51:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.23)
+# spec file for package yast2-installation (Version 2.18.24)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@


Name: yast2-installation
-Version: 2.18.23
+Version: 2.18.24
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.23.tar.bz2
+Source0: yast2-installation-2.18.24.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -39,8 +39,8 @@
BuildRequires: yast2-packager >= 2.17.9
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
-# `reboot_same_step, .proc.mounts
-Requires: yast2 >= 2.18.16
+# ProductControl::DisabledACItems, ::DisabledSubProposals
+Requires: yast2 >= 2.18.23
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
@@ -103,7 +103,7 @@
System installation code as present on installation media.

%prep
-%setup -n yast2-installation-2.18.23
+%setup -n yast2-installation-2.18.24

%build
%{prefix}/bin/y2tool y2autoconf
@@ -172,4 +172,5 @@
%doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
+
%changelog

++++++ yast2-installation-2.18.23.tar.bz2 -> yast2-installation-2.18.24.tar.bz2
++++++
++++ 2170 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/VERSION new/yast2-installation-2.18.24/VERSION
--- old/yast2-installation-2.18.23/VERSION 2009-08-26 15:35:20.000000000
+0200
+++ new/yast2-installation-2.18.24/VERSION 2009-09-04 19:06:16.000000000
+0200
@@ -1 +1 @@
-2.18.23
+2.18.24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/configure.in
new/yast2-installation-2.18.24/configure.in
--- old/yast2-installation-2.18.23/configure.in 2009-07-18 10:21:33.000000000
+0200
+++ new/yast2-installation-2.18.24/configure.in 2009-09-07 10:42:27.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-installation, 2.18.19, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 2.18.24, 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.18.19"
+VERSION="2.18.24"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka@xxxxxxx>"

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.SLED.xml
new/yast2-installation-2.18.24/control/control.SLED.xml
--- old/yast2-installation-2.18.23/control/control.SLED.xml 2009-08-10
14:17:25.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.SLED.xml 2009-09-04
13:29:07.000000000 +0200
@@ -110,6 +110,7 @@
Must be called before inst_netprobe however, it cannot
override it later on
-->
<ac_step>
+ <unique_id>ac_1</unique_id>
<text_id>ac_1</text_id>
<icon>yast-sw_single</icon>
<type>scripts</type>
@@ -122,6 +123,7 @@
</ac_step>
<!-- network proposal -->
<ac_step>
+ <unique_id>ac_2</unique_id>
<text_id>ac_2</text_id>
<icon>yast-network</icon>
<type>proposals</type>
@@ -137,6 +139,7 @@
</ac_step>
<!-- hardware proposal -->
<ac_step>
+ <unique_id>ac_3</unique_id>
<text_id>ac_3</text_id>
<icon>yast-hwinfo</icon>
<type>proposals</type>
@@ -149,6 +152,7 @@
</ac_step>
<!-- finishing configuration -->
<ac_step>
+ <unique_id>ac_4</unique_id>
<text_id>ac_4</text_id>
<icon>yast-sysconfig</icon>
<type>scripts</type>
@@ -352,6 +356,7 @@
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>inst_initial</unique_id>
<enable_skip>no</enable_skip>

<proposal_modules config:type="list">
@@ -431,6 +436,7 @@
<mode>update</mode>
<name>initial</name>
<stage>normal</stage>
+ <unique_id>update_settings_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>update</proposal_module>
@@ -445,6 +451,7 @@
<mode>update</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>update_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -462,6 +469,7 @@
<label>Network Configuration</label>
<name>network</name>
<stage>continue,normal</stage>
+ <unique_id>network_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -503,6 +511,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.SLES.xml
new/yast2-installation-2.18.24/control/control.SLES.xml
--- old/yast2-installation-2.18.23/control/control.SLES.xml 2009-08-10
14:14:14.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.SLES.xml 2009-09-04
14:09:33.000000000 +0200
@@ -318,6 +318,7 @@
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>inst_initial</unique_id>
<enable_skip>no</enable_skip>

<proposal_modules config:type="list">
@@ -405,6 +406,7 @@
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>inst_s390_initial</unique_id>
<enable_skip>no</enable_skip>

<proposal_modules config:type="list">
@@ -488,6 +490,7 @@
<mode>update</mode>
<name>initial</name>
<stage>normal</stage>
+ <unique_id>update_settings_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>update</proposal_module>
@@ -502,6 +505,7 @@
<mode>update</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>update_initial</unique_id>
<enable_skip>no</enable_skip>

<proposal_modules config:type="list">
@@ -522,6 +526,7 @@
<mode>update</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>update_S390_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -539,6 +544,7 @@
<label>Network Configuration</label>
<name>network</name>
<stage>continue,normal</stage>
+ <unique_id>network_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -581,6 +587,7 @@
<label>Network Configuration</label>
<name>network</name>
<stage>continue,normal</stage>
+ <unique_id>network_s390_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -605,6 +612,7 @@
<proposal>
<name>service</name>
<stage>continue,normal</stage>
+ <unique_id>service_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>ca_mgm</proposal_module>
<proposal_module>ldap-server</proposal_module>
@@ -616,6 +624,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_ppc64_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
@@ -628,6 +637,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_s390_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>printer</proposal_module>
@@ -638,6 +648,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.openSUSE.xml
new/yast2-installation-2.18.24/control/control.openSUSE.xml
--- old/yast2-installation-2.18.23/control/control.openSUSE.xml 2009-08-18
17:05:27.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.openSUSE.xml 2009-09-04
13:29:08.000000000 +0200
@@ -111,6 +111,7 @@
Must be called before inst_netprobe however, it cannot override
it later on
-->
<ac_step>
+ <unique_id>ac_1</unique_id>
<text_id>ac_1</text_id>
<icon>yast-sw_single</icon>
<type>scripts</type>
@@ -123,6 +124,7 @@
</ac_step>
<!-- network proposal -->
<ac_step>
+ <unique_id>ac_2</unique_id>
<text_id>ac_2</text_id>
<icon>yast-network</icon>
<type>proposals</type>
@@ -138,6 +140,7 @@
</ac_step>
<!-- hardware proposal -->
<ac_step>
+ <unique_id>ac_3</unique_id>
<text_id>ac_3</text_id>
<icon>yast-hwinfo</icon>
<type>proposals</type>
@@ -150,6 +153,7 @@
</ac_step>
<!-- finishing configuration -->
<ac_step>
+ <unique_id>ac_4</unique_id>
<text_id>ac_4</text_id>
<icon>yast-sysconfig</icon>
<type>scripts</type>
@@ -275,7 +279,7 @@
<name>xfce</name>
<desktop>startxfce4</desktop>
<label_id>desktop_xfce</label_id>
- <logon>gdm</logon>
+ <logon>xdm</logon>
<cursor>DMZ</cursor>
<packages>xfce4-desktop</packages>
<order config:type="integer">4</order>
@@ -308,6 +312,10 @@
</one_supported_desktop>

</supported_desktops>
+
+ <!-- FaTE #306967 KDE is preselected desktop -->
+ <default_desktop>kde</default_desktop>
+
</software>

<partitioning>
@@ -375,9 +383,7 @@
-->
<desktop_dialog><label>openSUSE offers you a choice of user interfaces.
The two major complete
desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full
-suite of applications including email, a file manager, games and utilities.
-
-As desktop selection is a matter of taste, we do not give a
recommendation.</label></desktop_dialog>
+suite of applications including email, a file manager, games and
utilities.</label></desktop_dialog>

<!-- Desktop dialog: desktop names -->
<desktop_gnome><label>GNOME</label></desktop_gnome>
@@ -409,6 +415,7 @@
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>inst_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -495,6 +502,7 @@
<mode>live_installation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>live_inst_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -511,6 +519,7 @@
<mode>update</mode>
<name>initial</name>
<stage>normal</stage>
+ <unique_id>update_settings_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>update</proposal_module>
@@ -525,6 +534,7 @@
<mode>update</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>update_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -541,6 +551,7 @@
<label>Network Configuration</label>
<name>network</name>
<stage>continue,normal</stage>
+ <unique_id>network_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -582,6 +593,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<!-- <proposal_module>x11</proposal_module> (bnc#441404) -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.rnc
new/yast2-installation-2.18.24/control/control.rnc
--- old/yast2-installation-2.18.23/control/control.rnc 2009-06-24
10:14:06.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.rnc 2009-09-04
11:37:26.000000000 +0200
@@ -158,6 +158,7 @@
automatic_configuration = element automatic_configuration {
LIST,
element ac_step {
+ element unique_id {text} &
element text_id { text }? &
element icon { text }? &
element type { "scripts" | "proposals" }? &
@@ -423,6 +424,7 @@
element stage { text } &
element name { text }? &
element type { text }? &
+ element unique_id { text} &
element enable_skip { "yes" | "no" }? &
element proposal_modules {
LIST,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.rng
new/yast2-installation-2.18.24/control/control.rng
--- old/yast2-installation-2.18.23/control/control.rng 2009-06-24
16:41:59.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.rng 2009-09-04
19:13:44.000000000 +0200
@@ -354,6 +354,9 @@
<oneOrMore>
<element name="ac_step">
<interleave>
+ <element name="unique_id">
+ <text/>
+ </element>
<optional>
<element name="text_id">
<text/>
@@ -963,6 +966,9 @@
<text/>
</element>
</optional>
+ <element name="unique_id">
+ <text/>
+ </element>
<optional>
<element name="enable_skip">
<choice>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/control.xml
new/yast2-installation-2.18.24/control/control.xml
--- old/yast2-installation-2.18.23/control/control.xml 2009-06-24
10:14:06.000000000 +0200
+++ new/yast2-installation-2.18.24/control/control.xml 2009-09-04
19:00:17.000000000 +0200
@@ -64,17 +64,6 @@
<clone_module>partitioning</clone_module>
<clone_module>bootloader</clone_module>
</clone_modules>
- <texts>
- <congratulate>
- <label>
-&lt;p&gt;&lt;b&gt;Congratulations!&lt;/b&gt;&lt;/p&gt;
-&lt;p&gt;The installation of &amp;product; on your machine is complete.
-After clicking &lt;b&gt;Finish&lt;/b&gt;, you can log in to the
system.&lt;/p&gt;
-&lt;p&gt;Visit us at %1.&lt;/p&gt;
-&lt;p&gt;Have a lot of fun!&lt;br&gt;Your SUSE Development Team&lt;/p&gt;
- </label>
- </congratulate>
- </texts>

<proposals config:type="list">
<proposal>
@@ -82,6 +71,7 @@
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>inst_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -126,6 +116,7 @@
<mode>update</mode>
<name>initial</name>
<stage>normal</stage>
+ <unique_id>update_settings_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>update</proposal_module>
@@ -140,6 +131,7 @@
<mode>update</mode>
<stage>initial</stage>
<name>initial</name>
+ <unique_id>update_initial</unique_id>
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -159,6 +151,7 @@
<label>Network Configuration</label>
<name>network</name>
<stage>continue,normal</stage>
+ <unique_id>network_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
@@ -199,6 +192,7 @@
<label>Hardware Configuration</label>
<name>hardware</name>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/examples/control_default.xml
new/yast2-installation-2.18.24/control/examples/control_default.xml
--- old/yast2-installation-2.18.23/control/examples/control_default.xml
2009-06-24 10:14:06.000000000 +0200
+++ new/yast2-installation-2.18.24/control/examples/control_default.xml
2009-09-04 19:00:17.000000000 +0200
@@ -18,6 +18,7 @@
<mode>installation</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>inst_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_hwinfo</proposal_module>
<proposal_module>proposal_mode</proposal_module>
@@ -34,6 +35,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_rootpart</proposal_module>
@@ -49,6 +51,7 @@
<mode>installation</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>inst_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_partitions</proposal_module>
@@ -62,6 +65,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_rootpart</proposal_module>
@@ -74,6 +78,7 @@
<proposal>
<type>network</type>
<stage>continue</stage>
+ <unique_id>network_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan_proposal</proposal_module>
<proposal_module>dsl_proposal</proposal_module>
@@ -86,6 +91,7 @@
<proposal>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11_proposal</proposal_module>
<proposal_module>printer_proposal</proposal_module>
@@ -97,6 +103,7 @@
<archs>s390,ppc64</archs>
<type>network</type>
<stage>continue</stage>
+ <unique_id>network_s390_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan_proposal</proposal_module>
<proposal_module>proxy_proposal</proposal_module>
@@ -107,6 +114,7 @@
<archs>ppc64</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11_proposal</proposal_module>
<proposal_module>printer_proposal</proposal_module>
@@ -116,6 +124,7 @@
<archs>s390</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_s390_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>printer_proposal</proposal_module>
</proposal_modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/examples/control_flex_part.xml
new/yast2-installation-2.18.24/control/examples/control_flex_part.xml
--- old/yast2-installation-2.18.23/control/examples/control_flex_part.xml
2009-06-24 10:14:06.000000000 +0200
+++ new/yast2-installation-2.18.24/control/examples/control_flex_part.xml
2009-09-04 19:00:17.000000000 +0200
@@ -47,6 +47,7 @@
<mode>installation</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>inst_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_hwinfo</proposal_module>
<proposal_module>proposal_mode</proposal_module>
@@ -63,6 +64,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_rootpart</proposal_module>
@@ -78,6 +80,7 @@
<mode>installation</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>inst_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_partitions</proposal_module>
@@ -91,6 +94,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>proposal_mode</proposal_module>
<proposal_module>proposal_rootpart</proposal_module>
@@ -103,6 +107,7 @@
<proposal>
<type>network</type>
<stage>continue</stage>
+ <unique_id>network_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan_proposal</proposal_module>
<proposal_module>dsl_proposal</proposal_module>
@@ -115,6 +120,7 @@
<proposal>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11_proposal</proposal_module>
<proposal_module>printer_proposal</proposal_module>
@@ -126,6 +132,7 @@
<archs>s390,ppc64</archs>
<type>network</type>
<stage>continue</stage>
+ <unique_id>network_s390_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan_proposal</proposal_module>
<proposal_module>proxy_proposal</proposal_module>
@@ -136,6 +143,7 @@
<archs>ppc64</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11_proposal</proposal_module>
<proposal_module>printer_proposal</proposal_module>
@@ -145,6 +153,7 @@
<archs>s390</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_s390_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>printer_proposal</proposal_module>
</proposal_modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/control/examples/custom.xml
new/yast2-installation-2.18.24/control/examples/custom.xml
--- old/yast2-installation-2.18.23/control/examples/custom.xml 2009-06-24
10:14:06.000000000 +0200
+++ new/yast2-installation-2.18.24/control/examples/custom.xml 2009-09-04
19:00:17.000000000 +0200
@@ -63,6 +63,7 @@
<!-- Type of proposal, initial, hardware, network -->
<type>initial</type>

+ <unique_id>inst_initial</unique_id>
<!-- Proposal modules, order matters -->
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
@@ -81,6 +82,7 @@
<mode>installation</mode>
<type>dirinstall</type>
<stage>normal</stage>
+ <unique_id>inst_dirinstal</unique_id>
<proposal_modules config:type="list">
<proposal_module>dirinstall_options</proposal_module>
<proposal_module>software</proposal_module>
@@ -90,6 +92,7 @@
<mode>installation</mode>
<type>uml</type>
<stage>normal</stage>
+ <unique_id>inst_uml_normal</unique_id>
<proposal_modules config:type="list">
<proposal_module>uml_source</proposal_module>
<proposal_module>uml_user</proposal_module>
@@ -102,6 +105,7 @@
<mode>update</mode>
<type>initial</type>
<stage>normal</stage>
+ <unique_id>update_initial_normal</unique_id>
<proposal_modules config:type="list">
<proposal_module>mode</proposal_module>
<proposal_module>rootpart</proposal_module>
@@ -116,6 +120,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>mode</proposal_module>
<proposal_module>rootpart</proposal_module>
@@ -131,6 +136,7 @@
<mode>installation</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>inst_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>mode</proposal_module>
<proposal_module>partitions</proposal_module>
@@ -145,6 +151,7 @@
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
+ <unique_id>update_s390_initial</unique_id>
<proposal_modules config:type="list">
<proposal_module>mode</proposal_module>
<proposal_module>rootpart</proposal_module>
@@ -157,6 +164,7 @@
<proposal>
<type>network</type>
<stage>continue,normal</stage>
+ <unique_id>network_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan</proposal_module>
<proposal_module>dsl</proposal_module>
@@ -169,6 +177,7 @@
<proposal>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
<proposal_module>printer</proposal_module>
@@ -180,6 +189,7 @@
<archs>s390,ppc64</archs>
<type>network</type>
<stage>continue</stage>
+ <unique_id>network_s390_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>lan</proposal_module>
<proposal_module>proxy</proposal_module>
@@ -190,6 +200,7 @@
<archs>ppc64</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_ppc64_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
<proposal_module>printer</proposal_module>
@@ -199,6 +210,7 @@
<archs>s390</archs>
<type>hardware</type>
<stage>continue</stage>
+ <unique_id>hardware_s390_continue</unique_id>
<proposal_modules config:type="list">
<proposal_module>printer</proposal_module>
</proposal_modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/src/clients/inst_automatic_configuration.ycp
new/yast2-installation-2.18.24/src/clients/inst_automatic_configuration.ycp
--- old/yast2-installation-2.18.23/src/clients/inst_automatic_configuration.ycp
2009-06-24 10:14:11.000000000 +0200
+++ new/yast2-installation-2.18.24/src/clients/inst_automatic_configuration.ycp
2009-09-04 14:20:57.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Automatic configuration instead of the second stage
* Authors: Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: inst_automatic_configuration.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_automatic_configuration.ycp 58525 2009-09-04 12:20:57Z
kmachalkova $
*
* @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
*/
@@ -64,8 +64,10 @@
return `next;
}

+ map< string, list <string> > disabled_ac_items =
ProductControl::GetDisabledACItems();
foreach (map one_step, acc, {
map new_step = $[
+ "unique" : one_step["unique_id"]:"",
"label" : one_step["text_id"]:"",
"icon" : one_step["icon"]:"yast",
"type" : one_step["type"]:"scripts",
@@ -81,6 +83,12 @@
return false;
}

+ if ( haskey( disabled_ac_items, new_step["unique"]:"") &&
+ contains(disabled_ac_items[ new_step["unique"]:"" ]:[],
one_item ) ) {
+ y2milestone("Item %1 found among disabled items", one_item);
+ return false;
+ }
+
return true;
});

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/src/include/inst_inc_second.ycp
new/yast2-installation-2.18.24/src/include/inst_inc_second.ycp
--- old/yast2-installation-2.18.23/src/include/inst_inc_second.ycp
2009-06-24 10:14:11.000000000 +0200
+++ new/yast2-installation-2.18.24/src/include/inst_inc_second.ycp
2009-09-04 18:28:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Functions for second stage
* Authors: Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: inst_inc_second.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_inc_second.ycp 58537 2009-09-04 16:28:41Z kmachalkova $
*
*/
{
@@ -80,9 +80,63 @@
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");
+ return;
+ }
+
+ if (! FileUtils::Exists (InstData::wizardsteps_disabled_ac_items)) {
+ y2milestone ("File %1 doesn't exist, skipping...",
InstData::wizardsteps_disabled_ac_items);
+ return;
+ }
+
+ map <string, list <string> > disabled_ac_items = (map <string, list
<string> >) SCR::Read (.target.ycp, InstData::wizardsteps_disabled_ac_items);
+ if (disabled_ac_items == nil) {
+ y2error ("Error reading %1",
InstData::wizardsteps_disabled_ac_items);
+ return;
+ }
+
+ foreach (string unique_id, list<string> ac_steps, disabled_ac_items, {
+ foreach (string one_ac_step, ac_steps, {
+ ProductControl::DisableACItem (unique_id, one_ac_step);
+ });
+ });
+
+ y2milestone ("Disabled AC items set to %1",
ProductControl::GetDisabledACItems());
+ }
+
void AdjustDisabledItems () {
AdjustDisabledModules();
AdjustDisabledProposals();
+ AdjustDisabledProposals();
+ AdjustDisabledACItems();
}

/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/src/inst_finish/installation_settings_finish.ycp
new/yast2-installation-2.18.24/src/inst_finish/installation_settings_finish.ycp
---
old/yast2-installation-2.18.23/src/inst_finish/installation_settings_finish.ycp
2009-06-24 10:14:16.000000000 +0200
+++
new/yast2-installation-2.18.24/src/inst_finish/installation_settings_finish.ycp
2009-09-04 18:28:41.000000000 +0200
@@ -5,7 +5,7 @@
* See bnc #364066, #390930.
* Authors: Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: installation_settings_finish.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: installation_settings_finish.ycp 58537 2009-09-04 16:28:41Z
kmachalkova $
*
*/

@@ -61,6 +61,27 @@
y2error ("Cannot write disabled proposals");
}

+ 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
+ );
+
+ if ((boolean) SCR::Write (.target.ycp,
InstData::wizardsteps_disabled_ac_items, ProductControl::GetDisabledACItems())
!= true) {
+ y2error ("Cannot write disabled AC items");
+ }
+
+
// bnc #390930
// Since there is no second stage during upgrade, SuSEConfig has to be
run
// by hooks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.23/src/modules/InstData.ycp
new/yast2-installation-2.18.24/src/modules/InstData.ycp
--- old/yast2-installation-2.18.23/src/modules/InstData.ycp 2009-06-24
10:14:12.000000000 +0200
+++ new/yast2-installation-2.18.24/src/modules/InstData.ycp 2009-09-04
16:21:29.000000000 +0200
@@ -43,6 +43,8 @@
// 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
global list <string> localDisabledModules = [];


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

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

< Previous Next >
This Thread