Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Feb 5 17:23:17 CET 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-02-01 12:57:29.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-02-05 15:47:45.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Feb 5 11:31:52 CET 2007 - locilka@suse.cz
+
+- Store Add-Ons at the end of first stage installation and restore
+ them before AutoYaST cloning at the end of the second stage
+ installation (bugzilla #187558).
+- Set license content before it is displayed for the first time,
+ select license language before it is displayed (#220847).
+- 2.15.7
+
+-------------------------------------------------------------------
+Fri Feb 2 15:25:04 CET 2007 - locilka@suse.cz
+
+- Removing dependency on yast2-slp package.
+- Moving all SLP-related functionality to yast2-packager-2.15.7.
+- Handling not installed yast2-slp package in Add-Ons (#238680).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.6.tar.bz2
New:
----
yast2-installation-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Yu9344/_old 2007-02-05 17:22:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Yu9344/_new 2007-02-05 17:22:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.6)
+# spec file for package yast2-installation (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
# norootforbuild
Name: yast2-installation
-Version: 2.15.6
+Version: 2.15.7
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.6.tar.bz2
+Source0: yast2-installation-2.15.7.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
-Requires: yast2-slp yast2-firewall
+Requires: yast2-firewall
Requires: yast2-update
Requires: yast2-storage yast2-mouse yast2-bootloader
-# SourceManager::InstallationSourceOnPartition 2.14.0, bugzilla #208222
-Requires: yast2-packager >= 2.14.0
+# add_inst_source_slptype.ycp client, bugzilla #238680
+Requires: yast2-packager >= 2.15.7
# extra sources in ResolvableProperties()
# "", `language", "" in ResolvableProperties()
Requires: yast2-pkg-bindings >= 2.13.101
@@ -69,7 +69,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.15.6
+%setup -n yast2-installation-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,6 +133,17 @@
%endif
%changelog -n yast2-installation
+* Mon Feb 05 2007 - locilka@suse.cz
+- Store Add-Ons at the end of first stage installation and restore
+ them before AutoYaST cloning at the end of the second stage
+ installation (bugzilla #187558).
+- Set license content before it is displayed for the first time,
+ select license language before it is displayed (#220847).
+- 2.15.7
+* Fri Feb 02 2007 - locilka@suse.cz
+- Removing dependency on yast2-slp package.
+- Moving all SLP-related functionality to yast2-packager-2.15.7.
+- Handling not installed yast2-slp package in Add-Ons (#238680).
* Thu Feb 01 2007 - locilka@suse.cz
- When an Add-On product is added and removed later, correctly
remove also cached control file of that Add-On (#238307).
++++++ yast2-installation-2.15.6.tar.bz2 -> yast2-installation-2.15.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/configure new/yast2-installation-2.15.7/configure
--- old/yast2-installation-2.15.6/configure 2007-01-22 15:09:18.000000000 +0100
+++ new/yast2-installation-2.15.7/configure 2007-02-05 15:50:52.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.5.
+# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.15.5'
-PACKAGE_STRING='yast2-installation 2.15.5'
+PACKAGE_VERSION='2.15.7'
+PACKAGE_STRING='yast2-installation 2.15.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1192,7 +1192,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.15.5 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.15.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1263,7 +1263,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.15.5:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.15.7:";;
esac
cat <<\_ACEOF
@@ -1341,7 +1341,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.15.5
+yast2-installation configure 2.15.7
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1355,7 +1355,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.15.5, which was
+It was created by yast2-installation $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2156,7 +2156,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.15.5'
+ VERSION='2.15.7'
cat >>confdefs.h <<_ACEOF
@@ -2383,7 +2383,7 @@
-VERSION="2.15.5"
+VERSION="2.15.7"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3512,7 +3512,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.15.5, which was
+This file was extended by yast2-installation $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3555,7 +3555,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.15.5
+yast2-installation config.status 2.15.7
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/configure.in new/yast2-installation-2.15.7/configure.in
--- old/yast2-installation-2.15.6/configure.in 2007-01-22 15:09:14.000000000 +0100
+++ new/yast2-installation-2.15.7/configure.in 2007-02-05 15:50:47.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.15.5, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.15.7, 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.15.5"
+VERSION="2.15.7"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/src/clients/inst_congratulate.ycp new/yast2-installation-2.15.7/src/clients/inst_congratulate.ycp
--- old/yast2-installation-2.15.6/src/clients/inst_congratulate.ycp 2006-12-12 10:58:19.000000000 +0100
+++ new/yast2-installation-2.15.7/src/clients/inst_congratulate.ycp 2007-02-05 11:32:37.000000000 +0100
@@ -6,7 +6,7 @@
*
* Display a congratulation message for the user.
*
- * $Id: inst_congratulate.ycp 34905 2006-12-12 09:58:17Z locilka $
+ * $Id: inst_congratulate.ycp 35849 2007-02-05 10:32:36Z locilka $
*/
{
@@ -22,6 +22,7 @@
import "Package";
import "ProductControl";
import "Stage";
+ import "AddOnProduct";
/**
* Function returns true when the default windowmanager is KDE
@@ -168,6 +169,10 @@
} until ( ret == `next || ret == `back );
if (UI::WidgetExists(`id(`do_clone)) && ret == `next && (boolean)UI::QueryWidget (`id(`do_clone), `Value)) {
+ // #187558
+ // Load Add-On products configured in the fist stage
+ AddOnProduct::ReadTmpExportFilename();
+
// #165860
// Save sources now because cloning garbles the target
// Cloning reinitializes sources when it needs them
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/src/clients/save_config_finish.ycp new/yast2-installation-2.15.7/src/clients/save_config_finish.ycp
--- old/yast2-installation-2.15.6/src/clients/save_config_finish.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.7/src/clients/save_config_finish.ycp 2007-02-05 11:32:37.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: save_config_finish.ycp 33835 2006-10-30 12:02:22Z locilka $
+ * $Id: save_config_finish.ycp 35849 2007-02-05 10:32:36Z locilka $
*
*/
@@ -29,6 +29,8 @@
import "Progress";
import "SignatureCheckDialogs";
import "Stage";
+import "AddOnProduct";
+import "FileUtils";
any ret = nil;
string func = "";
@@ -64,6 +66,28 @@
ProductFeatures::Save();
}
+ // Bugzilla #187558
+ // Save Add-On products configuration
+ // to be able to restore the settings
+ string save_to = AddOnProduct::TmpExportFilename();
+ if (FileUtils::Exists (save_to)) {
+ SCR::Execute (.target.remove, save_to);
+ }
+ if (Stage::initial ()) {
+ y2milestone ("Saving Add-On configuration...");
+ map exported_add_ons = AddOnProduct::Export();
+ if (exported_add_ons == nil) {
+ y2error ("Error, Add-Ons returned 'nil'");
+ } else {
+ boolean saved = (boolean) SCR::Write (.target.ycp, save_to, exported_add_ons);
+ if (saved) {
+ y2milestone ("Add-Ons configuration saved successfuly");
+ } else {
+ y2error ("Error occured when storing Add-Ons configuration!");
+ }
+ }
+ }
+
// progress step title
Progress::Title (_("Saving mouse configuration..."));
Mouse::Save();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/src/clients/test_inst_client.ycp new/yast2-installation-2.15.7/src/clients/test_inst_client.ycp
--- old/yast2-installation-2.15.6/src/clients/test_inst_client.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.7/src/clients/test_inst_client.ycp 2007-02-05 15:54:05.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: For testing the network and hardware proposals.
* Author: Michal Svec
*
- * $Id: test_inst_client.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: test_inst_client.ycp 35857 2007-02-05 14:54:03Z locilka $
*/
{
@@ -22,7 +22,9 @@
if (!is (aclient, string))
return false;
string client = (string) aclient;
-if (find (client, "inst_") != 0)
+
+// Client name does not start with "inst_"
+if (! regexpmatch(client, "^inst_"))
{
client = "inst_" + client;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/src/include/add-on-workflow.ycp new/yast2-installation-2.15.7/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.15.6/src/include/add-on-workflow.ycp 2007-02-01 12:38:04.000000000 +0100
+++ new/yast2-installation-2.15.7/src/include/add-on-workflow.ycp 2007-02-02 15:18:06.000000000 +0100
@@ -25,9 +25,9 @@
import "Mode";
import "Popup";
import "Report";
-import "SLP";
import "Sequencer";
import "SourceManager";
+import "PackageSystem";
import "SuSEFirewall";
import "Stage";
import "Wizard";
@@ -54,27 +54,6 @@
symbol createResult = `again;
/**
- * Function scans for SLP installation servers on the network
- *
- * @returns symbol one of `back, `next
- */
-symbol AddSourceTypeSLP () {
- string service = SourceManager::AddSourceTypeSLP ();
- if (service == nil) {
- y2milestone("No service selected, returning back...");
-
- return `back;
- }
-
- y2milestone ("Trying to add source '%1'", service);
- // add the installation source
- symbol createResult = SourceManager::createSource(service);
- y2milestone ("Adding source result: %1", createResult);
-
- return `next;
-}
-
-/**
* Checks whether some network is available in the current moment,
* see the bug #170147 for more information.
*/
@@ -250,8 +229,33 @@
y2milestone ("Current: %1", input);
if ( input == `slp )
{
+ string required_package = "yast2-slp";
+ boolean installed_before = PackageSystem::Installed (required_package);
+
+ if (! Mode::installation () && ! installed_before) {
+ // Tries to Check and Install packages
+ if (
+ ! PackageSystem::CheckAndInstallPackagesInteractive ([required_package]) ||
+ ! PackageSystem::Installed (required_package)
+ ) {
+ Report::Error (sformat (
+ // popup error message, %1 is the package name
+ _("Cannot search for SLP installation sources
+without having %1 package installed"),
+ required_package
+ ));
+ y2warning ("Not searching for SLP sources");
+ ret = nil;
+ continue;
+ // New .slp agent has been added
+ // FIXME: lazy loading of agents will make this obsolete
+ } else {
+ SCR::RegisterAgent(.slp, `ag_slp(`SlpAgent()));
+ }
+ }
+
// moved to another function
- ret = AddSourceTypeSLP();
+ ret = (symbol) WFM::call("add_inst_source_slptype");
y2milestone("SLP-Add returned: %1", ret);
if (ret == `next)
createResult = `ok;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.7/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp 2007-02-01 12:38:07.000000000 +0100
+++ new/yast2-installation-2.15.7/src/modules/AddOnProduct.ycp 2007-02-05 11:28:50.000000000 +0100
@@ -30,6 +30,7 @@
import "InstShowInfo";
import "ProductLicense";
import "FileUtils";
+import "Directory";
// variables for installation with product
/**
@@ -49,6 +50,15 @@
/**
* List of all selected sources
+ *
+ * @struct add_on_products = [
+ * $[
+ * "media" : 4, // ID of the source
+ * "product_dir" : "/",
+ * "product" : "openSUSE version XX.Y",
+ * ],
+ * ...
+ * ]
*/
global list