Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Tue Feb 9 21:55:35 CET 2010.
--------
--- yast2-installation/yast2-installation.changes 2010-01-15 17:29:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2010-02-09 16:16:42.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Feb 9 14:49:33 CET 2010 - locilka@ssue.cz
+
+- Fixed license agreement check box visibility (BNC #571846).
+- 2.19.3
+
+-------------------------------------------------------------------
+Tue Feb 2 11:03:04 CET 2010 - locilka@suse.cz
+
+- Added LXDE to openSUSE control file (FATE #307729).
+
+-------------------------------------------------------------------
+Mon Feb 1 11:35:15 CET 2010 - locilka@suse.cz
+
+- Fixed 'going back' from services proposal BNC #572734.
+
+-------------------------------------------------------------------
+Fri Jan 22 15:56:07 CET 2010 - aschnell@suse.de
+
+- fixed message during ssh installation (bnc #518616)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.19.1.tar.bz2
New:
----
yast2-installation-2.19.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.h2vZ0n/_old 2010-02-09 21:54:54.000000000 +0100
+++ /var/tmp/diff_new_pack.h2vZ0n/_new 2010-02-09 21:54:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.19.1)
+# spec file for package yast2-installation (Version 2.19.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-installation
-Version: 2.19.1
+Version: 2.19.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.19.1.tar.bz2
+Source0: yast2-installation-2.19.3.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -103,7 +103,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.19.1
+%setup -n yast2-installation-2.19.3
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.19.1.tar.bz2 -> yast2-installation-2.19.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/VERSION new/yast2-installation-2.19.3/VERSION
--- old/yast2-installation-2.19.1/VERSION 2010-01-15 14:15:12.000000000 +0100
+++ new/yast2-installation-2.19.3/VERSION 2010-02-09 14:55:11.000000000 +0100
@@ -1 +1 @@
-2.19.1
+2.19.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/configure new/yast2-installation-2.19.3/configure
--- old/yast2-installation-2.19.1/configure 2009-12-22 10:37:13.000000000 +0100
+++ new/yast2-installation-2.19.3/configure 2010-02-09 16:02:47.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-installation 2.19.0.
+# Generated by GNU Autoconf 2.63 for yast2-installation 2.19.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.19.0'
-PACKAGE_STRING='yast2-installation 2.19.0'
+PACKAGE_VERSION='2.19.3'
+PACKAGE_STRING='yast2-installation 2.19.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1285,7 +1285,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.19.0 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.19.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.19.0:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.19.3:";;
esac
cat <<\_ACEOF
@@ -1437,7 +1437,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.19.0
+yast2-installation configure 2.19.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1451,7 +1451,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.19.0, which was
+It was created by yast2-installation $as_me 2.19.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2431,7 +2431,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.19.0'
+ VERSION='2.19.3'
cat >>confdefs.h <<_ACEOF
@@ -2553,7 +2553,7 @@
-VERSION="2.19.0"
+VERSION="2.19.3"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3743,7 +3743,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.19.0, which was
+This file was extended by yast2-installation $as_me 2.19.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3793,7 +3793,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-installation config.status 2.19.0
+yast2-installation config.status 2.19.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/configure.in new/yast2-installation-2.19.3/configure.in
--- old/yast2-installation-2.19.1/configure.in 2009-12-22 10:37:10.000000000 +0100
+++ new/yast2-installation-2.19.3/configure.in 2010-02-09 16:02:43.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.19.0, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.19.3, 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.19.0"
+VERSION="2.19.3"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/control/control.SLES.xml new/yast2-installation-2.19.3/control/control.SLES.xml
--- old/yast2-installation-2.19.1/control/control.SLES.xml 2009-12-09 17:08:45.000000000 +0100
+++ new/yast2-installation-2.19.3/control/control.SLES.xml 2010-02-01 11:38:27.000000000 +0100
@@ -646,6 +646,7 @@
</proposal>
<proposal>
+ <label>Network Services Configuration</label>
<name>service</name>
<stage>continue,normal</stage>
service_continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/control/control.openSUSE.xml new/yast2-installation-2.19.3/control/control.openSUSE.xml
--- old/yast2-installation-2.19.1/control/control.openSUSE.xml 2009-12-15 10:45:17.000000000 +0100
+++ new/yast2-installation-2.19.3/control/control.openSUSE.xml 2010-02-02 11:02:32.000000000 +0100
@@ -199,9 +199,9 @@
<!-- Default update repository, bnc #381360 -->
- <baseurl>http://download.opensuse.org/update/11.2/</baseurl>
+ <baseurl>http://download.opensuse.org/update/11.3/</baseurl>
<alias>repo-update</alias>
- <name>openSUSE-11.2-Update</name>
+ <name>openSUSE-11.3-Update</name>
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">true</autorefresh>
@@ -210,36 +210,36 @@
<!-- Replacement for EXTRAURLS and OPTIONALURLS -->
- <baseurl>http://download.opensuse.org/distribution/11.2/repo/oss/</baseurl>
+ <baseurl>http://download.opensuse.org/distribution/11.3/repo/oss/</baseurl>
<alias>repo-oss</alias>
- <name>openSUSE-11.2-Oss</name>
+ <name>openSUSE-11.3-Oss</name>
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">true</autorefresh>
<priority config:type="integer">99</priority>
- <baseurl>http://download.opensuse.org/distribution/11.2/repo/non-oss/</baseurl>
+ <baseurl>http://download.opensuse.org/distribution/11.3/repo/non-oss/</baseurl>
<alias>repo-non-oss</alias>
- <name>openSUSE-11.2-Non-Oss</name>
+ <name>openSUSE-11.3-Non-Oss</name>
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">true</autorefresh>
<priority config:type="integer">99</priority>
- <baseurl>http://download.opensuse.org/debug/distribution/11.2/repo/oss/</baseurl>
+ <baseurl>http://download.opensuse.org/debug/distribution/11.3/repo/oss/</baseurl>
<alias>repo-debug</alias>
- <name>openSUSE-11.2-Debug</name>
+ <name>openSUSE-11.3-Debug</name>
/
<enabled config:type="boolean">false</enabled>
<autorefresh config:type="boolean">true</autorefresh>
<priority config:type="integer">99</priority>
- <baseurl>http://download.opensuse.org/source/distribution/11.2/repo/oss/</baseurl>
+ <baseurl>http://download.opensuse.org/source/distribution/11.3/repo/oss/</baseurl>
<alias>repo-source</alias>
- <name>openSUSE-11.2-Source</name>
+ <name>openSUSE-11.3-Source</name>
/
<enabled config:type="boolean">false</enabled>
<autorefresh config:type="boolean">true</autorefresh>
@@ -287,6 +287,19 @@
<icon>pattern-xfce</icon>
+ <!-- FaTE #307729 LXDE -->
+
+ <name>lxde</name>
+ <desktop>startlxde</desktop>
+ desktop_lxde
+ <logon>lxdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>lxde-common</packages>
+ <order config:type="integer">5</order>
+ <patterns>lxde x11 base</patterns>
+ <icon>pattern-lxde</icon>
+
+
<name>min_x</name>
<desktop>twm</desktop>
@@ -395,6 +408,7 @@
<label>GNOME Desktop</label>
<label>KDE Desktop</label>
<label>XFCE Desktop</label>
+ <label>LXDE Desktop</label>
<label>Minimal X Window</label>
<label>Minimal Server Selection (Text Mode)</label>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/src/clients/inst_ask_online_update.ycp new/yast2-installation-2.19.3/src/clients/inst_ask_online_update.ycp
--- old/yast2-installation-2.19.1/src/clients/inst_ask_online_update.ycp 2009-07-21 16:37:54.000000000 +0200
+++ new/yast2-installation-2.19.3/src/clients/inst_ask_online_update.ycp 2010-02-01 11:34:41.000000000 +0100
@@ -27,6 +27,12 @@
import "Installation";
import "NetworkService";
+ // BNC #572734
+ if (GetInstArgs::going_back()) {
+ y2milestone ("going_back -> returning `auto");
+ return `auto;
+ }
+
// BNC #450229
// There used to be >if (!Internet::do_you)<
if (NetworkService::isNetworkRunning() != true) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.19.3/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.19.1/src/clients/inst_complex_welcome.ycp 2010-01-08 15:56:23.000000000 +0100
+++ new/yast2-installation-2.19.3/src/clients/inst_complex_welcome.ycp 2010-02-09 14:56:44.000000000 +0100
@@ -20,7 +20,7 @@
* Attention:
* This is still work in progress ...
*
- * $Id: inst_complex_welcome.ycp 60277 2010-01-07 14:29:32Z jsuchome $
+ * $Id: inst_complex_welcome.ycp 60766 2010-02-09 13:58:04Z locilka $
*
*/
{
@@ -53,7 +53,8 @@
boolean text_mode = Language::GetTextMode ();
- string license_ui_id = "base_license";
+ integer license_id = Pkg::SourceGetCurrent(true)[0]:0;
+ string license_ui_id = tostring (license_id);
/* ----------------------------------------------------------------------
* Build dialog
@@ -293,7 +294,7 @@
return false;
}
- ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0);
+ ProductLicense::ShowLicenseInInstallation (`base_license_rp, license_id);
// bugzilla #206706
if (Mode::autoinst()) {
@@ -301,6 +302,7 @@
}
// If accepting the license is required, show the check-box
+ y2milestone ("Acceptance needed: %1 => %2", license_ui_id, ProductLicense::AcceptanceNeeded (license_ui_id));
if (ProductLicense::AcceptanceNeeded (license_ui_id)) {
UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox);
}
@@ -347,7 +349,7 @@
if (ret == `next) break;
} else if (ret == `show_fulscreen_license) {
UI::OpenDialog (AllLicensesDialog());
- ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0);
+ ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, license_id);
UI::CloseDialog();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/src/include/scr_switch_debugger.ycp new/yast2-installation-2.19.3/src/include/scr_switch_debugger.ycp
--- old/yast2-installation-2.19.1/src/include/scr_switch_debugger.ycp 2009-07-21 16:37:54.000000000 +0200
+++ new/yast2-installation-2.19.3/src/include/scr_switch_debugger.ycp 2010-02-08 15:04:54.000000000 +0100
@@ -530,7 +530,7 @@
current_line = current_line + 1;
// SCR has died, printing the last 15 lines
- if (regexpmatch (one_line, " Finished YaST2 component ")) {
+ if (regexpmatch (one_line, " Finished YaST.* component ")) {
ReportLine (_("SCR process has died, printing the last log lines..."));
integer start_line = current_line - 15;
PrintLinesFromTo (start_line, current_line);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.1/startup/YaST2.ssh new/yast2-installation-2.19.3/startup/YaST2.ssh
--- old/yast2-installation-2.19.1/startup/YaST2.ssh 2009-07-21 16:37:55.000000000 +0200
+++ new/yast2-installation-2.19.3/startup/YaST2.ssh 2010-01-27 10:11:10.000000000 +0100
@@ -15,7 +15,7 @@
# : if we are within a ssh installation environment
# : This script is called manually
# :
-# STATUS : $Id: YaST2.ssh 52833 2008-11-03 14:04:32Z aschnell $
+# STATUS : $Id: YaST2.ssh 60499 2010-01-22 14:57:59Z aschnell $
#----------------
#========================================
@@ -62,11 +62,15 @@
# running the second stage installation
/usr/lib/YaST2/startup/YaST2.call installation continue
- # second stage installation needs to reboot
- if [ -f /var/lib/YaST2/reboot ]; then
+ if [ -f /etc/install.inf ] ; then
+ SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf)
+ fi
+
+ if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then
+ # second stage installation needs to reboot
reboot_during_second_stage
- # second stage has just finished
else
+ # second stage has just finished
continue_after_second_stage
fi
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org