Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Sep 25 00:58:00 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-09-12 10:36:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-09-24 13:44:27.000000000 +0200
@@ -1,0 +2,42 @@
+Tue Sep 23 16:17:27 CEST 2008 - locilka@suse.cz
+
+- Buggy SCR Agent run.get.suseconfig.modules replaced with
+ .target.dir (bnc #429146).
+- Added functionality to recover from failed read of previously
+ used repositories in inst_upgrade_urls (bnc #429059).
+- 2.17.14
+
+-------------------------------------------------------------------
+Mon Sep 22 16:14:54 CEST 2008 - locilka@suse.cz
+
+- Fixed checking whether directory is mounted already (bnc #428368)
+
+-------------------------------------------------------------------
+Mon Sep 22 13:59:50 CEST 2008 - locilka@suse.cz
+
+- KDE 3.5 moved to 'Others', removed KDE 3.5 description text.
+- GNOME 2.22 changed to 2.24.
+- Fixed Installation Mode dialog to show icons again (bnc #427344).
+- 2.17.13
+
+-------------------------------------------------------------------
+Mon Sep 22 10:45:44 CEST 2008 - locilka@suse.cz
+
+- Changing /sbin/udevtrigger & /sbin/udevsettle to /sbin/udevadm
+ trigger & settle (bnc #427705).
+- 2.17.12
+
+-------------------------------------------------------------------
+Thu Sep 18 10:35:32 CEST 2008 - locilka@suse.cz
+
+- Definition of supported desktops added into SLES and SLED control
+ files, added also default_desktop definition (bnc #427061).
+- Added control file documentation for supported_desktops section.
+
+-------------------------------------------------------------------
+Fri Sep 12 15:01:46 CEST 2008 - locilka@suse.cz
+
+- Disabling inst_suse_register in openSUSE control file
+ (FATE #303458).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.17.11.tar.bz2
New:
----
yast2-installation-2.17.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.e27837/_old 2008-09-25 00:57:26.000000000 +0200
+++ /var/tmp/diff_new_pack.e27837/_new 2008-09-25 00:57:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.11)
+# spec file for package yast2-installation (Version 2.17.14)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.11
+Version: 2.17.14
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.11.tar.bz2
+Source0: yast2-installation-2.17.14.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()
@@ -114,7 +114,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.11
+%setup -n yast2-installation-2.17.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,7 +165,6 @@
/usr/share/YaST2/scrconf/etc_install_inf.scr
/usr/share/YaST2/scrconf/etc_install_inf_alias.scr
/usr/share/YaST2/scrconf/etc_install_inf_options.scr
-/usr/share/YaST2/scrconf/run_get_suseconfig_modules.scr
/usr/share/YaST2/scrconf/proc_modules.scr
/usr/share/YaST2/scrconf/run_df.scr
# fillup
@@ -184,6 +183,30 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Sep 23 2008 locilka@suse.cz
+- Buggy SCR Agent run.get.suseconfig.modules replaced with
+ .target.dir (bnc #429146).
+- Added functionality to recover from failed read of previously
+ used repositories in inst_upgrade_urls (bnc #429059).
+- 2.17.14
+* Mon Sep 22 2008 locilka@suse.cz
+- Fixed checking whether directory is mounted already (bnc #428368)
+* Mon Sep 22 2008 locilka@suse.cz
+- KDE 3.5 moved to 'Others', removed KDE 3.5 description text.
+- GNOME 2.22 changed to 2.24.
+- Fixed Installation Mode dialog to show icons again (bnc #427344).
+- 2.17.13
+* Mon Sep 22 2008 locilka@suse.cz
+- Changing /sbin/udevtrigger & /sbin/udevsettle to /sbin/udevadm
+ trigger & settle (bnc #427705).
+- 2.17.12
+* Thu Sep 18 2008 locilka@suse.cz
+- Definition of supported desktops added into SLES and SLED control
+ files, added also default_desktop definition (bnc #427061).
+- Added control file documentation for supported_desktops section.
+* Fri Sep 12 2008 locilka@suse.cz
+- Disabling inst_suse_register in openSUSE control file
+ (FATE #303458).
* Fri Sep 12 2008 locilka@suse.cz
- Do not remove installation repository with the same URL as URL
just being removed by inst_upgrade_urls (bnc #400823).
++++++ yast2-installation-2.17.11.tar.bz2 -> yast2-installation-2.17.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/agents/run_get_suseconfig_modules.scr new/yast2-installation-2.17.14/agents/run_get_suseconfig_modules.scr
--- old/yast2-installation-2.17.11/agents/run_get_suseconfig_modules.scr 2008-04-17 11:08:34.000000000 +0200
+++ new/yast2-installation-2.17.14/agents/run_get_suseconfig_modules.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-/**
- * File:
- * run_get_suseconfig_modules
- * Summary:
- * SCR Agent that returns all SuSEconfig modules
- * Access:
- * read-only
- * Authors:
- * Stefan Hundhammer
- * See:
- * anyagent
- * libscr
- * man ls
- * Example:
- * Read(.run.get.suseconfig.modules)
- * (["fonts", "kdm2", "pam", "pcmcia", ... , "ypclient"])
- *
- * $Id: run_get_suseconfig_modules.scr 13018 2003-12-11 12:52:53Z jhumpol $
- *
- * Returns a <b>list</b> of SuSEconfig modules.
- */
-.run.get.suseconfig.modules
-
-`ag_anyagent(
- `Description (
- ( `Run( " \
-cd /sbin/conf.d; \
-/bin/ls \
-| /usr/bin/sed -e 's/^SuSEconfig\.//' \
-| grep -v 'aaa_at_first' \
-| grep -v '~$' \
-| egrep -v '\.(swp|bak|sav|save|orig)$' \
-| egrep -v '\.rpm(orig|save|new)$'
-"
- )
- ),
- "\n", // Comment
- true, // read-only
- (`List (
- `String ("^ \t\n"),
- `String ("\n\t ")
- ))
- )
- )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/configure new/yast2-installation-2.17.14/configure
--- old/yast2-installation-2.17.11/configure 2008-09-12 10:36:52.000000000 +0200
+++ new/yast2-installation-2.17.14/configure 2008-09-22 15:21:43.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.11.
+# Generated by GNU Autoconf 2.61 for yast2-installation 2.17.13.
#
# 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.11'
-PACKAGE_STRING='yast2-installation 2.17.11'
+PACKAGE_VERSION='2.17.13'
+PACKAGE_STRING='yast2-installation 2.17.13'
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.11 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.17.13 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.11:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.17.13:";;
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.11
+yast2-installation configure 2.17.13
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.11, which was
+It was created by yast2-installation $as_me 2.17.13, 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.11'
+ VERSION='2.17.13'
cat >>confdefs.h <<_ACEOF
@@ -2420,7 +2420,7 @@
-VERSION="2.17.11"
+VERSION="2.17.13"
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.11, which was
+This file was extended by yast2-installation $as_me 2.17.13, 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.11
+yast2-installation config.status 2.17.13
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.11/configure.in new/yast2-installation-2.17.14/configure.in
--- old/yast2-installation-2.17.11/configure.in 2008-09-12 10:36:50.000000000 +0200
+++ new/yast2-installation-2.17.14/configure.in 2008-09-22 15:21:40.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.11, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.17.13, 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.11"
+VERSION="2.17.13"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/control/docs/control-section.xml new/yast2-installation-2.17.14/control/docs/control-section.xml
--- old/yast2-installation-2.17.11/control/docs/control-section.xml 2008-08-15 12:01:43.000000000 +0200
+++ new/yast2-installation-2.17.14/control/docs/control-section.xml 2008-09-18 13:02:10.000000000 +0200
@@ -542,6 +542,9 @@
<section id="control_software">
<title>Software</title>
+<!--
+ FIXME: Obsolete, check and document the current behavior
+
<para>
Using this section in the control file you can change the software
proposal during installation.
@@ -597,6 +600,21 @@
<para>
which matches the base selections in <emphasis>SLES 9</emphasis>.
</para>
+-->
+ <para>In the <emphasis>software</emphasis> section you can define how is the selection
+ of software handled during installation or update.</para>
+
+ <para>This is a list of supported entries in <emphasis>software</emphasis>:</para>
+
+ <itemizedlist>
+
+ <listitem id="software_default_desktop">
+ <para><emphasis>default_desktop</emphasis> - defines a desktop selected by
+ default by the installation.</para>
+ </listitem>
+
+ </itemizedlist>
+
<para>Additionally, you can configure how updating of packages should be
performed. The following options are available:</para>
<itemizedlist>
@@ -761,6 +779,86 @@
</section>
+ <section id="control_software_supported_desktops">
+ <title>Supported Desktops</title>
+
+ <!-- BNC #427061 -->
+ <para>This part defines not only all the desktops for Desktop Selection dialog
+ during installation but also the <link linkend="software_default_desktop">default_desktop</link>
+ must be defined</para>
+
+ <para>Example of supported desktops:</para>
+ <programlisting>
+
+ http://www.w3.org/2001/XInclude"/>
+ </programlisting>
+
+ <para>Section <emphasis>supported_desktops</emphasis> contains list of
+ one or more <emphasis>one_supported_desktop</emphasis> sections.</para>
+
+ <itemizedlist>
+ <title>Keys sypported in one_supported_desktop</title>
+
+ <listitem>
+ <para>(string) <emphasis>name</emphasis></para>
+ <para>Unique ID.</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>desktop</emphasis></para>
+ <para>Desktop to start (gnome, startkde4, startkde3, startxfce4, ...).</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>label_id</emphasis></para>
+ <para>Text ID used for desktop selection label.</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>logon</emphasis></para>
+ <para>Logon manager to start (gdm, kdm4, kdm3, xdm, ...).</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>cursor</emphasis></para>
+ <para>Cursor theme.</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>packages</emphasis></para>
+ <para>(whitespace-separated).</para>
+ </listitem>
+
+ <listitem>
+ <para>(integer) <emphasis>order</emphasis></para>
+ <para>Numeric order or the desktop in Desktop Selection dialog.
+ Number <emphasis>1</emphasis> is reserved for major desktops
+ that are displayed with description (<emphasis>description_id</emphasis>
+ is required). If the very same <emphasis>order</emphasis> is used
+ for more than one desktops, they are sorted alphabetically.</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>patterns</emphasis></para>
+ <para>Patterns to select for the desktop (whitespace-separated).</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>icon</emphasis></para>
+ <para>Icon used in Desktop Selection dialog, just a name of an icon from
+ $current_theme/icons/64x64/apps/ directory, without <emphasis>.png</emphasis>
+ suffix.</para>
+ </listitem>
+
+ <listitem>
+ <para>(string) <emphasis>description_id</emphasis></para>
+ <para>Text ID used for desktop selection label.</para>
+ </listitem>
+
+ </itemizedlist>
+ </section>
+
<section id="control_software_scenarios">
<title>System Scenarios</title>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/control/docs/examples/supported_desktops.xml new/yast2-installation-2.17.14/control/docs/examples/supported_desktops.xml
--- old/yast2-installation-2.17.11/control/docs/examples/supported_desktops.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.17.14/control/docs/examples/supported_desktops.xml 2008-09-18 11:28:20.000000000 +0200
@@ -0,0 +1,51 @@
+
+http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+ <software>
+
+
+
+
+ <name>gnome</name>
+ <desktop>gnome</desktop>
+ desktop_gnome
+ <logon>gdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>gdm</packages>
+ <order config:type="integer">1</order>
+ <patterns>gnome x11 base</patterns>
+ <icon>pattern-gnome</icon>
+ description_gnome
+
+
+
+ <name>kde</name>
+ <desktop>startkde4</desktop>
+ <!-- Generic ID used in texts below -->
+ desktop_kde
+ <logon>kdm4</logon>
+ <cursor>DMZ</cursor>
+ <packages>kde4-kdm</packages>
+ <order config:type="integer">1</order>
+ <patterns>kde x11 base</patterns>
+ <icon>pattern-kde4</icon>
+ <!-- Generic ID used in texts below -->
+ description_kde
+
+
+
+
+ </software>
+
+ <texts>
+
+ <label>GNOME</label>
+ <!-- See 'desktop_kde' in 'supported_desktops' -->
+ <label>KDE 4.1</label>
+
+ <label>Some description</label>
+ <!-- See 'description_kde' in 'supported_desktops' -->
+ <label>Some description</label>
+
+ </texts>
+</productDefines>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.17.14/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_addon_update_sources.ycp 2008-05-30 13:17:29.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_addon_update_sources.ycp 2008-09-23 13:42:25.000000000 +0200
@@ -13,7 +13,7 @@
textdomain "installation";
import "GetInstArgs";
-import "PackageCallbacksInit";
+import "PackageCallbacks";
import "Popup";
import "SourceManager";
import "Report";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_mode.ycp new/yast2-installation-2.17.14/src/clients/inst_mode.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_mode.ycp 2008-09-08 17:49:54.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_mode.ycp 2008-09-23 16:21:51.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_mode.ycp 50824 2008-09-08 15:49:53Z locilka $
+ * $Id: inst_mode.ycp 51415 2008-09-23 14:22:10Z locilka $
*
*/
@@ -20,7 +20,7 @@
import "Kernel";
import "Linuxrc";
import "Mode";
-import "PackageCallbacksInit";
+import "PackageCallbacks";
import "Packages";
import "Popup";
import "ProductControl";
@@ -29,6 +29,7 @@
import "Storage";
import "Wizard";
import "ProductFeatures";
+import "Directory";
include "packager/storage_include.ycp";
include "installation/misc.ycp";
@@ -131,7 +132,7 @@
CreateRadioButtonTerm (
_("New &Installation"),
`install,
- "/usr/share/icons/hicolor/32x32/apps/yast-dirinstall.png",
+ Directory::themedir + "/current/icons/48x48/apps/yast-dirinstall.png",
!Mode::update ()
),
`VSpacing( 0.3 ),
@@ -139,7 +140,7 @@
CreateRadioButtonTerm (
_("&Update"),
`update,
- "/usr/share/icons/hicolor/32x32/apps/yast-update.png",
+ Directory::themedir + "/current/icons/48x48/apps/yast-update.png",
Mode::update ()
),
`VSpacing( 1.8 ),
@@ -147,7 +148,7 @@
CreateRadioButtonTerm (
_("Re&pair Installed System"),
`repair,
- "/usr/share/icons/hicolor/32x32/apps/yast.png",
+ Directory::themedir + "/current/icons/48x48/apps/yast.png",
false
)
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_new_desktop.ycp new/yast2-installation-2.17.14/src/clients/inst_new_desktop.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_new_desktop.ycp 2008-09-10 12:08:26.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_new_desktop.ycp 2008-09-22 15:10:40.000000000 +0200
@@ -22,7 +22,6 @@
import "Popup";
import "Stage";
import "Directory";
-import "Icon";
import "ProductControl";
// do not offer the dialog if base selection is fixed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_pre_install.ycp new/yast2-installation-2.17.14/src/clients/inst_pre_install.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_pre_install.ycp 2008-08-11 17:41:07.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_pre_install.ycp 2008-09-22 16:12:44.000000000 +0200
@@ -124,12 +124,11 @@
y2milestone("Mounting %1 to %2", partition_device, mnt_tmpdir);
string already_mounted = sformat ("grep '[\\t ]%1[\\t ]' /proc/mounts", mnt_tmpdir);
- integer am_exit = (integer) SCR::Execute (.target.bash, already_mounted);
+ map am = (map) SCR::Execute (.target.bash_output, already_mounted);
- if (am_exit != 0) {
+ if (am["exit"]:-1 == 0 && size (am["stdout"]:"") > 0) {
y2warning ("%1 is already mounted, trying to umount...", mnt_tmpdir);
- boolean umount = (boolean) SCR::Execute (.target.umount, mnt_tmpdir);
- if (umount != true) {
+ if ((boolean) SCR::Execute (.target.umount, mnt_tmpdir) != true) {
y2error ("Cannot umount %1", mnt_tmpdir);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_proposal.ycp new/yast2-installation-2.17.14/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_proposal.ycp 2008-09-08 17:49:54.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_proposal.ycp 2008-09-23 16:21:51.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 50824 2008-09-08 15:49:53Z locilka $
+ * $Id: inst_proposal.ycp 51415 2008-09-23 14:22:10Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -817,7 +817,7 @@
if (UI::WidgetExists(`_cwm_tab)) {
UI::ChangeWidget (`id (`_cwm_tab), `CurrentItem, current_tab);
} else {
- y2warning ("Widget with id %1 does not exist!", `_cwm_tab);
+ y2milestone ("Not using CWM tabs...");
}
}
if ( Stage::stage () == "initial" )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_suseconfig.ycp new/yast2-installation-2.17.14/src/clients/inst_suseconfig.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_suseconfig.ycp 2008-08-25 14:13:26.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_suseconfig.ycp 2008-09-23 16:21:51.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Andreas Schwab
* Stefan Hundhammer
*
- * $Id: inst_suseconfig.ycp 50257 2008-08-21 11:02:11Z jsuchome $
+ * $Id: inst_suseconfig.ycp 51415 2008-09-23 14:22:10Z locilka $
*
* Purpose:
* - shows the "Finishing the installation" frame
@@ -103,8 +103,25 @@
this process can take some time.</p>
");
+ // BNC #429146
+ list <string> tmp_modules = (list<string>) SCR::Read (.target.dir, "/sbin/conf.d/");
+ list <string> modules = [];
+ integer counter = -1;
+
+ foreach (string one_module, tmp_modules, {
+ if (! regexpmatch (one_module, "^SuSEconfig\\."))
+ return;
+
+ if (regexpmatch (one_module, "\\.(swp|bak|sav|save|orig|rpmorig|rpmsave|rpmnew)$"))
+ return;
+
+ one_module = regexpsub (one_module, "^SuSEconfig\\.(.*)", "\\1");
+ counter = counter + 1;
+ modules[counter] = one_module;
+ });
+
+ y2milestone ("SuSEconfig scripts to call: %1", modules);
- list<string> modules = (list<string>) SCR::Read( .run.get.suseconfig.modules );
integer max_steps = size( modules ) + 1; // + ldconfig
if ( reread_inittab )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.17.14/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.17.11/src/clients/inst_upgrade_urls.ycp 2008-09-12 10:31:06.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/inst_upgrade_urls.ycp 2008-09-23 12:15:16.000000000 +0200
@@ -78,7 +78,10 @@
]
]);
- counter = counter + 1;
+ if (xmlcontent == nil || xmlcontent == $[]) {
+ y2error ("Can't read %1, SCR returned erroneous data: %2", one_source_file, xmlcontent);
+ return;
+ }
// bnc #300901
boolean enabled = nil;
@@ -110,6 +113,7 @@
}
});
+ counter = counter + 1;
old_urls[counter] = one_old_url;
});
@@ -183,7 +187,7 @@
counter = counter + 1;
return `item (
`id (counter),
- (one_url["url_will_be_enabled"]:false ?
+ (one_url["url_will_be_enabled"]:false == true ?
// TRANSLATORS: Table item status (repository)
_("Enabled")
:
@@ -364,6 +368,7 @@
}
integer id = -1;
+ string url_url = "";
urls = maplist (map one_url, urls, {
id = id + 1;
@@ -371,7 +376,15 @@
// unique ID
one_url["id"] = sformat ("ID: %1", id);
- one_url["url_will_be_enabled"] = FindCurrentURLStatus (tostring (one_url["url"]:""));
+ // BNC #429059
+ if (haskey (one_url, "url") && one_url["url"]:nil != nil) {
+ url_url = sformat ("%1", one_url["url"]:"");
+ one_url["url_will_be_enabled"] = FindCurrentURLStatus (url_url);
+ } else {
+ y2warning ("No 'url' defined: %1", one_url);
+ one_url["url_will_be_enabled"] = false;
+ }
+
one_url["initial_url_status"] = one_url["url_will_be_enabled"]:false;
return one_url;
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/clients/kernel_finish.ycp new/yast2-installation-2.17.14/src/clients/kernel_finish.ycp
--- old/yast2-installation-2.17.11/src/clients/kernel_finish.ycp 2008-05-30 13:17:29.000000000 +0200
+++ new/yast2-installation-2.17.14/src/clients/kernel_finish.ycp 2008-09-22 10:49:56.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: kernel_finish.ycp 30012 2006-04-11 20:20:31Z jsrain $
+ * $Id: kernel_finish.ycp 51347 2008-09-22 08:50:10Z locilka $
*
*/
@@ -58,7 +58,10 @@
// Write list of modules to load after system gets up
Kernel::SaveModulesToLoad ();
- SCR::Execute (.target.bash, "/sbin/udevtrigger ; /sbin/udevsettle --timeout=60");
+ // BNC #427705, formerly added as BNC #163073
+ // after the chroot into the installed system has been performed.
+ // This will recreate all missing links.
+ SCR::Execute (.target.bash, "/sbin/udevadm trigger; /sbin/udevadm settle --timeout=60");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/src/config/release_notes.desktop new/yast2-installation-2.17.14/src/config/release_notes.desktop
--- old/yast2-installation-2.17.11/src/config/release_notes.desktop 2008-05-19 09:31:57.000000000 +0200
+++ new/yast2-installation-2.17.14/src/config/release_notes.desktop 2008-09-17 13:42:15.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Support;
X-SuSE-YaST-Call=inst_release_notes
X-SuSE-YaST-RootOnly=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.11/VERSION new/yast2-installation-2.17.14/VERSION
--- old/yast2-installation-2.17.11/VERSION 2008-09-12 10:32:05.000000000 +0200
+++ new/yast2-installation-2.17.14/VERSION 2008-09-24 13:44:34.000000000 +0200
@@ -1 +1 @@
-2.17.11
+2.17.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org