Hello community,
here is the log from the commit of package yast2-add-on
checked in at Thu Mar 29 00:16:15 CEST 2007.
--------
--- yast2-add-on/yast2-add-on.changes 2007-03-13 15:53:36.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-add-on/yast2-add-on.changes 2007-03-28 16:14:02.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Mar 28 16:11:59 CEST 2007 - locilka@suse.cz
+
+- Adjusted to use WorkflowManager instead of AddOnProduct module
+ in some cases (for FATE #129).
+- Adjusted RPM requirements and BuildRequires.
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.15.4.tar.bz2
New:
----
yast2-add-on-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.A14637/_old 2007-03-29 00:15:52.000000000 +0200
+++ /var/tmp/diff_new_pack.A14637/_new 2007-03-29 00:15:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on (Version 2.15.4)
+# spec file for package yast2-add-on (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,21 +11,23 @@
# norootforbuild
Name: yast2-add-on
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-2.15.4.tar.bz2
+Source0: yast2-add-on-2.15.5.tar.bz2
prefix: /usr
Requires: autoyast2-installation
-Requires: yast2
+# WorkflowManager module
+Requires: yast2 >= 2.15.22
Requires: yast2-installation
Requires: yast2-country
# AddOnProduct::RedrawWizardSteps (global)
Requires: yast2-packager >= 2.15.23
Requires: yast2-storage
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-installation yast2-packager yast2-storage yast2-testsuite
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-installation yast2-packager yast2-storage yast2-testsuite
+BuildRequires: yast2 >= 2.15.22
# splitted from yast2-installation
Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp
Provides: yast2-installation:/usr/share/YaST2/clients/add-on.ycp
@@ -45,7 +47,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-add-on-2.15.4
+%setup -n yast2-add-on-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +86,11 @@
%doc %{prefix}/share/doc/packages/yast2-add-on
%changelog
+* Wed Mar 28 2007 - locilka@suse.cz
+- Adjusted to use WorkflowManager instead of AddOnProduct module
+ in some cases (for FATE #129).
+- Adjusted RPM requirements and BuildRequires.
+- 2.15.5
* Tue Mar 13 2007 - locilka@suse.cz
- Redraw Wizard steps when Add-Ons are changed in the installation
proposal. This change allows to reflect the current workflow look
++++++ yast2-add-on-2.15.4.tar.bz2 -> yast2-add-on-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.4/src/add-on_proposal.ycp new/yast2-add-on-2.15.5/src/add-on_proposal.ycp
--- old/yast2-add-on-2.15.4/src/add-on_proposal.ycp 2007-03-13 15:24:12.000000000 +0100
+++ new/yast2-add-on-2.15.5/src/add-on_proposal.ycp 2007-03-26 14:52:01.000000000 +0200
@@ -13,6 +13,7 @@
import "Label";
import "Wizard";
import "AddOnProduct";
+import "WorkflowManager";
include "add-on/add-on-workflow.ycp";
@@ -40,7 +41,7 @@
items = [ _("No add-on product selected for installation") ];
}
- AddOnProduct::RedrawWizardSteps();
+ WorkflowManager::RedrawWizardSteps();
ret = $[
"raw_proposal" : items,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.4/src/add-on-workflow.ycp new/yast2-add-on-2.15.5/src/add-on-workflow.ycp
--- old/yast2-add-on-2.15.4/src/add-on-workflow.ycp 2007-02-23 10:06:54.000000000 +0100
+++ new/yast2-add-on-2.15.5/src/add-on-workflow.ycp 2007-03-28 09:03:39.000000000 +0200
@@ -18,6 +18,7 @@
textdomain "add-on";
import "AddOnProduct";
+import "WorkflowManager";
import "Linuxrc";
import "Mode";
import "Popup";
@@ -305,7 +306,7 @@
}
AddOnProduct::last_ret = ret;
- y2milestone ("Media Select Dialog ret: %1", ret);
+ y2milestone ("MediaSelect Dialog ret: %1", ret);
return ret;
}
@@ -321,6 +322,7 @@
{
// error report
Report::Error (_("No catalog found on medium."));
+ y2milestone ("CatalogSelect Dialog ret: %1", `back);
return `back;
}
@@ -330,6 +332,8 @@
{
y2milestone ("Deleting source %1", sources[0]:0);
Pkg::SourceDelete(sources[0]:0);
+
+ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret);
return AddOnProduct::last_ret;
}
@@ -351,22 +355,16 @@
// error report
Report::Error (_("Failed to initialize the catalog."));
AddOnProduct::ClearRegistrationRequest (src_id);
+
+ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret);
return `finish;
}
-/*
-// moved below, in order to check whether the product has been installed first
- // Display /media.1/info.txt if such file exists
- // Display license and wait for agreement
- boolean license_ret = AddOnProduct::AcceptedLicenseAndInfoFile(src_id);
- if (license_ret != true) {
- y2milestone("Removing the current source ID %1", src_id);
- Pkg::SourceDelete(src_id);
- return `finish;
- }
-*/
+
AddOnProduct::src_id = src_id;
SourceManager::newSources = [src_id];
y2milestone ("Only one source available - skipping dialog");
+
+ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret);
return AddOnProduct::last_ret;
}
y2milestone ("Running catalog select dialog");
@@ -460,13 +458,17 @@
// error report
Report::Error (_("Failed to initialize the catalog."));
AddOnProduct::ClearRegistrationRequest (selected);
+
+ y2milestone ("CatalogSelect Dialog ret: %1", `finish);
return `finish;
}
AddOnProduct::src_id = selected;
SourceManager::newSources = [selected];
}
+
AddOnProduct::last_ret = ret;
+ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret);
return ret;
}
@@ -509,6 +511,8 @@
if (license_ret != true) {
y2milestone("Removing the current source ID %1", AddOnProduct::src_id);
Pkg::SourceDelete(AddOnProduct::src_id);
+
+ y2milestone ("ProductSelect Dialog ret: %1", `abort);
return `abort;
}
@@ -527,6 +531,8 @@
AddOnProduct::mode_config_sources
= add (AddOnProduct::mode_config_sources, AddOnProduct::src_id);
}
+
+ y2milestone ("ProductSelect Dialog ret: %1", `next);
return `next;
}
@@ -569,6 +575,8 @@
if (license_ret != true) {
y2milestone("Removing the current source ID %1", AddOnProduct::src_id);
Pkg::SourceDelete(AddOnProduct::src_id);
+
+ y2milestone ("ProductSelect Dialog ret: %1", `abort);
return `abort;
}
@@ -589,6 +597,8 @@
AddOnProduct::src_id, current_url, src_general_data["product_dir"]:"");
Pkg::SourceDelete (AddOnProduct::src_id);
AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id);
+
+ y2milestone ("ProductSelect Dialog ret: %1", `finish);
return `finish;
}
}
@@ -601,6 +611,8 @@
// message popup
Popup::Message (_("Dependencies of the add-on product cannot be fulfilled."));
AddOnProduct::last_ret = `back;
+
+ y2milestone ("ProductSelect Dialog ret: %1", `back);
return `back;
}
// check whether the product is already available on some media - it is similar as below
@@ -635,6 +647,8 @@
AddOnProduct::mode_config_sources =
add (AddOnProduct::mode_config_sources, AddOnProduct::src_id);
}
+
+ y2milestone ("ProductSelect Dialog ret: %1", `next);
return `next;
}
@@ -733,6 +747,8 @@
AddOnProduct::src_id, url, product_dir);
Pkg::SourceDelete (AddOnProduct::src_id);
AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id);
+
+ y2milestone ("ProductSelect Dialog ret: %1", `finish);
return `finish;
}
}
@@ -766,6 +782,7 @@
}
AddOnProduct::last_ret = ret;
+ y2milestone ("ProductSelect Dialog ret: %1", AddOnProduct::last_ret);
return ret;
}
@@ -897,7 +914,7 @@
boolean some_addon_changed = false;
// store the initial settings, only once
- AddOnProduct::StoreInitialSettings();
+ WorkflowManager::SetBaseWorkflow (false);
repeat {
ret = (symbol) Wizard::UserInput();
@@ -935,11 +952,12 @@
{
return prod != nil;
});
+
+ // Remove product from add-ons
+ AddOnProduct::Disintegrate (media);
- // remove a temporary file, not needed anymore
- // bugzilla #238307
- AddOnProduct::RemoveAddOnControlFile (media);
some_addon_changed = true;
+
// remove product from list of product to register (FATE #301312)
AddOnProduct::RemoveRegistrationFlag (media);
@@ -949,6 +967,9 @@
} else if (ret == `add) {
symbol ret = RunWizard ();
if (ret == `next) {
+ // Add-On product has been added, integrate it (change workflow, use y2update)
+ AddOnProduct::Integrate (AddOnProduct::src_id);
+
// check whether it requests registration (FATE #301312)
AddOnProduct::PrepareForRegistration (AddOnProduct::src_id);
some_addon_changed = true;
@@ -957,6 +978,7 @@
}
} until ( ret == `next || ret == `back );
+
y2milestone ("Ret: %1, Some Add-on Added/Removed: %2", ret, some_addon_changed);
y2milestone ("Registration will be requested: %1", AddOnProduct::ProcessRegistration());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.4/VERSION new/yast2-add-on-2.15.5/VERSION
--- old/yast2-add-on-2.15.4/VERSION 2007-03-13 15:25:19.000000000 +0100
+++ new/yast2-add-on-2.15.5/VERSION 2007-03-28 16:07:53.000000000 +0200
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org