Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Feb 2 13:09:05 CET 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-01-22 15:06:48.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-02-01 12:57:29.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Feb 1 12:41:36 CET 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).
+- 2.15.6
+
+-------------------------------------------------------------------
+Wed Jan 31 09:34:11 CET 2007 - locilka@suse.cz
+
+- Rereading all SCR Agents in case of installation workflow changed
+ by Add-On product (#239055).
+- Calling PackageLock::Check before Pkg calls (#238556).
+
+-------------------------------------------------------------------
+Sun Jan 28 22:27:48 CET 2007 - locilka@suse.cz
+
+- Removed tv and bluetooth hardware proposals from SLES control
+ file. There are no such modules in that product (#238759).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.5.tar.bz2
New:
----
yast2-installation-2.15.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.c13870/_old 2007-02-02 13:08:56.000000000 +0100
+++ /var/tmp/diff_new_pack.c13870/_new 2007-02-02 13:08:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.5)
+# spec file for package yast2-installation (Version 2.15.6)
#
# Copyright (c) 2007 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.15.5
+Version: 2.15.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.5.tar.bz2
+Source0: yast2-installation-2.15.6.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
@@ -69,7 +69,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.15.5
+%setup -n yast2-installation-2.15.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,6 +133,17 @@
%endif
%changelog -n yast2-installation
+* 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).
+- 2.15.6
+* Wed Jan 31 2007 - locilka@suse.cz
+- Rereading all SCR Agents in case of installation workflow changed
+ by Add-On product (#239055).
+- Calling PackageLock::Check before Pkg calls (#238556).
+* Sun Jan 28 2007 - locilka@suse.cz
+- Removed tv and bluetooth hardware proposals from SLES control
+ file. There are no such modules in that product (#238759).
* Mon Jan 22 2007 - locilka@suse.cz
- Correct handling of CD/DVD Add-Ons in installation (#237264).
- Fixed switching between Installation Settings tabs in case of
++++++ yast2-installation-2.15.5.tar.bz2 -> yast2-installation-2.15.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/include/add-on-workflow.ycp new/yast2-installation-2.15.6/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.15.5/src/include/add-on-workflow.ycp 2007-01-22 14:57:48.000000000 +0100
+++ new/yast2-installation-2.15.6/src/include/add-on-workflow.ycp 2007-02-01 12:38:04.000000000 +0100
@@ -95,7 +95,7 @@
ret = true;
}
// some devices are listed
- } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "") {
+ } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "" && cmd_run["stdout"]:"" != "\n") {
ret = true;
}
@@ -937,7 +937,8 @@
});
// remove a temporary file, not needed anymore
- AddOnProduct::RemoveAddOnControlFile (selected);
+ // bugzilla #238307
+ AddOnProduct::RemoveAddOnControlFile (media);
some_addon_changed = true;
// remove product from list of product to register (FATE #301312)
AddOnProduct::RemoveRegistrationFlag (media);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.15.5/src/modules/AddOnProduct.ycp 2006-12-11 16:10:14.000000000 +0100
+++ new/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp 2007-02-01 12:38:07.000000000 +0100
@@ -698,6 +698,25 @@
}
/**
+ * New add-on product might add also new agents.
+ * Functions Rereads all available agents.
+ *
+ * @see bugzilla #239055
+ */
+global void RereadAllSCRAgents () {
+ y2milestone ("Rereading SCR Agents...");
+ integer handle = WFM::SCRGetDefault ();
+ WFM::SCRClose (handle);
+ integer new_scr = WFM::SCROpen ("scr", true);
+
+ if (new_scr < 1) {
+ y2error("Rereading SCR failed!");
+ } else {
+ y2milestone("Rereading SCR succeeded.");
+ }
+}
+
+/**
* Remove the /y2update directory from the system
*/
void CleanY2Update() {
@@ -760,6 +779,9 @@
Report::Error (_("An error occurred while preparing the installation system."));
CleanY2Update();
return nil;
+ } else {
+ // bugzilla #239055
+ RereadAllSCRAgents();
}
}
else
@@ -1096,6 +1118,14 @@
global boolean RemoveAddOnControlFile (integer srcid) {
string filename = sformat("%1/%2.xml", TmpdirForControlFiles(), srcid);
+ // remove also from list of control files
+ // #238307
+ string this_control_file = sformat ("%1.xml", srcid);
+ control_files_to_add = filter (string one_control_file, control_files_to_add, {
+ return one_control_file != this_control_file;
+ });
+ y2milestone ("Control files in use now: %1", control_files_to_add);
+
if (FileUtils::Exists (filename)) {
y2milestone ("Removing: %1", filename);
if ((boolean) SCR::Execute (.target.remove, filename)) {
@@ -1116,6 +1146,8 @@
global boolean ReIntegrateFromScratch () {
y2milestone ("Reintegration workflows from scratch...");
ResetSystemWorkflowsAndProposals ();
+ // bugzilla #239055
+ RereadAllSCRAgents();
foreach (map prod, AddOnProduct::add_on_products, {
integer srcid = (integer) prod["media"]:nil;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/modules/Product.ycp new/yast2-installation-2.15.6/src/modules/Product.ycp
--- old/yast2-installation-2.15.5/src/modules/Product.ycp 2006-11-29 15:47:34.000000000 +0100
+++ new/yast2-installation-2.15.6/src/modules/Product.ycp 2007-01-31 14:45:29.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Product data
* Authors: Klaus Kaempf
*
- * $Id: Product.ycp 34204 2006-11-09 12:32:32Z locilka $
+ * $Id: Product.ycp 35736 2007-01-31 13:45:25Z locilka $
*/
{
@@ -12,6 +12,7 @@
import "Mode";
import "Stage";
+ import "PackageLock";
/**
* General product name and version
@@ -71,6 +72,12 @@
global string shortlabel = "";
global list