Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Jul 27 17:53:44 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-07-18 16:25:33.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-07-27 15:06:03.000000000 +0200
@@ -1,0 +2,32 @@
+Thu Jul 27 14:18:01 CEST 2006 - jsrain@suse.cz
+
+- added support for merging multiple proposal items as one proposal
+ item (eg. to group langage and keyboard)
+- 2.13.139
+
+-------------------------------------------------------------------
+Wed Jul 26 09:18:36 CEST 2006 - jsrain@suse.cz
+
+- get version from installed product proper way (#157924)
+
+-------------------------------------------------------------------
+Tue Jul 25 14:32:18 CEST 2006 - jsrain@suse.cz
+
+- beep before rebooting the machine during installation (#144614)
+
+-------------------------------------------------------------------
+Mon Jul 24 13:56:22 CEST 2006 - jsrain@suse.cz
+
+- fixed error reporting when creating a source (#159695)
+- abort installation if package manager initialization fails
+ (#167674)
+- report proper message if no catalog found via SLP and firewall
+ is running (#156444)
+
+-------------------------------------------------------------------
+Tue Jul 18 16:57:08 CEST 2006 - jsrain@suse.cz
+
+- fixed displaying catalog selection dialog if multiple catalogs
+ found on add-on media (#192761)
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.138.tar.bz2
New:
----
yast2-installation-2.13.139.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.fddEKV/_old 2006-07-27 17:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.fddEKV/_new 2006-07-27 17:53:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.138)
+# spec file for package yast2-installation (Version 2.13.139)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.138
+Version: 2.13.139
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.138.tar.bz2
+Source0: yast2-installation-2.13.139.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2-update
@@ -55,7 +55,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.138
+%setup -n yast2-installation-2.13.139
%build
%{prefix}/bin/y2tool y2autoconf
@@ -123,6 +123,23 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Thu Jul 27 2006 - jsrain@suse.cz
+- added support for merging multiple proposal items as one proposal
+ item (eg. to group langage and keyboard)
+- 2.13.139
+* Wed Jul 26 2006 - jsrain@suse.cz
+- get version from installed product proper way (#157924)
+* Tue Jul 25 2006 - jsrain@suse.cz
+- beep before rebooting the machine during installation (#144614)
+* Mon Jul 24 2006 - jsrain@suse.cz
+- fixed error reporting when creating a source (#159695)
+- abort installation if package manager initialization fails
+ (#167674)
+- report proper message if no catalog found via SLP and firewall
+ is running (#156444)
+* Tue Jul 18 2006 - jsrain@suse.cz
+- fixed displaying catalog selection dialog if multiple catalogs
+ found on add-on media (#192761)
* Tue Jul 18 2006 - jsrain@suse.cz
- fixed vendor URL in congratulate dialog (#187358)
- 2.13.138
++++++ yast2-installation-2.13.138.tar.bz2 -> yast2-installation-2.13.139.tar.bz2 ++++++
++++ 2693 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.13.138/VERSION new/yast2-installation-2.13.139/VERSION
--- old/yast2-installation-2.13.138/VERSION 2006-07-18 16:17:43.000000000 +0200
+++ new/yast2-installation-2.13.139/VERSION 2006-07-27 14:58:29.000000000 +0200
@@ -1 +1 @@
-2.13.138
+2.13.139
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.13.138/configure.in new/yast2-installation-2.13.139/configure.in
--- old/yast2-installation-2.13.138/configure.in 2006-07-18 16:23:52.000000000 +0200
+++ new/yast2-installation-2.13.139/configure.in 2006-07-27 15:04:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.138, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.139, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.138"
+VERSION="2.13.139"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
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.13.138/control/control.xml new/yast2-installation-2.13.139/control/control.xml
--- old/yast2-installation-2.13.138/control/control.xml 2006-06-26 08:43:32.000000000 +0200
+++ new/yast2-installation-2.13.139/control/control.xml 2006-07-27 14:51:03.000000000 +0200
@@ -96,7 +96,7 @@
partitions
software_simple
- language_simple
+ country_simple
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.13.138/src/clients/inst_finish.ycp new/yast2-installation-2.13.139/src/clients/inst_finish.ycp
--- old/yast2-installation-2.13.138/src/clients/inst_finish.ycp 2006-06-26 08:43:41.000000000 +0200
+++ new/yast2-installation-2.13.139/src/clients/inst_finish.ycp 2006-07-25 14:33:08.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 30681 2006-05-04 11:11:37Z jsrain $
+ * $Id: inst_finish.ycp 31982 2006-07-25 12:34:40Z jsrain $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -199,6 +199,7 @@
if (size (Misc::boot_msg) > 0 && !Mode::autoinst ())
{
+ SCR::Execute (.target.bash, "/bin/echo -e '\a'");
if (Linuxrc::usessh ())
Report::DisplayMessages (true, 0);
else
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.13.138/src/clients/inst_proposal.ycp new/yast2-installation-2.13.139/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.13.138/src/clients/inst_proposal.ycp 2006-06-26 08:43:40.000000000 +0200
+++ new/yast2-installation-2.13.139/src/clients/inst_proposal.ycp 2006-07-27 14:22:23.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Stefan Hundhammer
* Arvin Schnell
*
- * $Id: inst_proposal.ycp 30239 2006-04-19 13:05:36Z locilka $
+ * $Id: inst_proposal.ycp 32021 2006-07-27 12:23:54Z jsrain $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -196,10 +196,15 @@
if (!contains(locked_modules, submod))
{
+ string heading = issubstring (
+ titles[no]:"",
+ " i, descr["menu_titles"]:[], {
+ string id = i["id"]:"";
+ string title = i["title"]:"";
+ if (id != "" && title != "")
+ {
+ menu_list = add (menu_list, `item (`id (id),
+ title + "..."));
+ }
+ else
+ {
+ y2error ("Invalid menu item: %1", i);
+ }
+ });
+ }
+ else
+ {
+ string menu_title = descr["menu_title"]:descr["rich_text_title"]:submod;
+ menu_list = add( menu_list,
+ `item(`id( id ), menu_title + "..." ));
+ }
}
});
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.13.138/src/clients/inst_system_analysis.ycp new/yast2-installation-2.13.139/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.13.138/src/clients/inst_system_analysis.ycp 2006-06-26 08:43:44.000000000 +0200
+++ new/yast2-installation-2.13.139/src/clients/inst_system_analysis.ycp 2006-07-24 10:36:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
*
- * $Id: inst_system_analysis.ycp 30311 2006-04-20 20:25:02Z jsrain $
+ * $Id: inst_system_analysis.ycp 31964 2006-07-24 08:38:06Z jsrain $
*
*/
@@ -341,6 +341,13 @@
}
Packages::InitializeCatalogs ();
+if (Packages::InitFailed ())
+{
+ // popup message
+ Popup::Message (_("Failed to initialize catalogs.
+Aborting the installation."));
+ return `abort;
+}
Packages::InitializeAddOnProducts ();
if (Mode::mode () != start_mode)
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.13.138/src/clients/vendor.ycp new/yast2-installation-2.13.139/src/clients/vendor.ycp
--- old/yast2-installation-2.13.138/src/clients/vendor.ycp 2006-06-26 08:43:40.000000000 +0200
+++ new/yast2-installation-2.13.139/src/clients/vendor.ycp 2006-07-26 09:19:38.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Load vendor driver CD
* Authors: Klaus Kaempf
*
- * $Id: vendor.ycp 22833 2005-03-29 11:59:45Z jsrain $
+ * $Id: vendor.ycp 31984 2006-07-26 07:21:09Z jsrain $
*/
{
@@ -118,11 +118,21 @@
}
else
{
- list productdata = Pkg::TargetProducts();
- if (productdata == nil) productdata = [];
- string product = productdata[0,"product"]:"SuSE Linux 8.1";
- list splitproduct = splitstring (product, " ");
- string version = splitproduct[size(splitproduct)-1]:"8.1";
+ Pkg::TargetInit ("/", false);
+ list