Hello community,
here is the log from the commit of package yast2-add-on
checked in at Tue Oct 14 19:27:40 CEST 2008.
--------
--- yast2-add-on/yast2-add-on.changes 2008-10-01 11:58:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-add-on/yast2-add-on.changes 2008-10-14 14:06:59.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Oct 14 13:00:52 CEST 2008 - locilka@suse.cz
+
+- Add-Ons AutoYaST client now sets the product name if found by
+ RepositoryScan (bnc #434708).
+- Repository name defined in AutoYaST profile is preferred
+ (bnc #433981).
+- Using [OK] button to accept the AutoYaST configuration overview
+ dialog (bnc #427407).
+- 2.17.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-add-on-2.17.5.tar.bz2
New:
----
yast2-add-on-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.k19736/_old 2008-10-14 19:27:28.000000000 +0200
+++ /var/tmp/diff_new_pack.k19736/_new 2008-10-14 19:27:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on (Version 2.17.5)
+# spec file for package yast2-add-on (Version 2.17.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-add-on
-Version: 2.17.5
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-2.17.5.tar.bz2
+Source0: yast2-add-on-2.17.6.tar.bz2
Prefix: /usr
Requires: autoyast2-installation
# WorkflowManager module
@@ -58,7 +58,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-add-on-2.17.5
+%setup -n yast2-add-on-2.17.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -96,6 +96,14 @@
/usr/share/YaST2/schema/autoyast/rnc/add-on.rnc
%doc %{prefix}/share/doc/packages/yast2-add-on
%changelog
+* Tue Oct 14 2008 locilka@suse.cz
+- Add-Ons AutoYaST client now sets the product name if found by
+ RepositoryScan (bnc #434708).
+- Repository name defined in AutoYaST profile is preferred
+ (bnc #433981).
+- Using [OK] button to accept the AutoYaST configuration overview
+ dialog (bnc #427407).
+- 2.17.6
* Wed Oct 01 2008 locilka@suse.cz
- Changed texts (bnc #431177).
- 2.17.5
++++++ yast2-add-on-2.17.5.tar.bz2 -> yast2-add-on-2.17.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.17.5/src/add-on_auto.ycp new/yast2-add-on-2.17.6/src/add-on_auto.ycp
--- old/yast2-add-on-2.17.5/src/add-on_auto.ycp 2008-05-14 11:51:41.000000000 +0200
+++ new/yast2-add-on-2.17.6/src/add-on_auto.ycp 2008-10-14 14:01:56.000000000 +0200
@@ -96,7 +96,7 @@
Wizard::CreateDialog ();
AutoinstSoftware::pmInit ();
PackageCallbacksInit::InitPackageCallbacks ();
- ret = RunAddOnMainDialog (true, true, Label::BackButton(), Label::NextButton());
+ ret = RunAddOnMainDialog (true, true, Label::BackButton(), Label::OKButton());
UI::CloseDialog ();
return ret;
}
@@ -111,67 +111,131 @@
* Write configuration data
* return boolean
*
-
- <add-on>
-
- <listentry>
- http://software.opensuse.org/download/server:/dns/SLE_10/
- <product>buildservice</product>
- /
- <signature-handling>
- true
- true
- true
-
- <all config:type="boolean">true</all>
- <keys config:type="list">
- <keyid>...</keyid>
- <keyid>3B3011B76B9D6523</keyid>
- </keys>
-
-
- <all config:type="boolean">true</all>
- <keys config:type="list">
- <keyid>...</keyid>
- </keys>
-
-
- <all config:type="boolean">true</all>
- <keys config:type="list">
- <keyid>...</keyid>
- </keys>
-
- </signature-handling>
- </listentry>
-
- </add-on>
-
+ * @struct
+ * <add-on>
+ *
+ * <listentry>
+ * http://software.opensuse.org/download/server:/dns/SLE_10/
+ * <product>buildservice</product>
+ * /
+ * <!-- (optional) -->
+ * <name>User-Defined Product Name</name>
+ * <signature-handling>
+ * true
+ * true
+ * true
+ *
+ * <all config:type="boolean">true</all>
+ * <keys config:type="list">
+ * <keyid>...</keyid>
+ * <keyid>3B3011B76B9D6523</keyid>
+ * </keys>
+ *
+ *
+ * <all config:type="boolean">true</all>
+ * <keys config:type="list">
+ * <keyid>...</keyid>
+ * </keys>
+ *
+ *
+ * <all config:type="boolean">true</all>
+ * <keys config:type="list">
+ * <keyid>...</keyid>
+ * </keys>
+ *
+ * </signature-handling>
+ * </listentry>
+ *
+ * </add-on>
+ *
*/
else if (func == "Write") {
- map > sources = $[];
- AddOnProduct::add_on_products = maplist (map prod, AddOnProduct::add_on_products, {
+ map > sources = $[];
+
+ AddOnProduct::add_on_products = maplist (map prod, AddOnProduct::add_on_products, {
string media = prod["media_url"]:"";
string pth = prod["product_dir"]:"/";
sources[media] = sources[media]:$[];
- AddOnProduct::SetSignatureCallbacks( prod["product"]:"" ); // set addon specific sig-handling
- //if (sources[media, pth]:-1 == -1)
+
+ // set addon specific sig-handling
+ AddOnProduct::SetSignatureCallbacks (prod["product"]:"");
+
+ integer srcid = -1;
+
do {
- integer srcid = Pkg::SourceCreate (media, pth);
- if ( (srcid == -1 || srcid == nil) && !prod["ask_on_error"]:false )
+ srcid = Pkg::SourceCreate (media, pth);
+
+ if ((srcid == -1 || srcid == nil) && !prod["ask_on_error"]:false) {
// error report
Report::Error (_("Failed to add add-on product."));
- else if( (srcid == -1 || srcid == nil) && prod["ask_on_error"]:false )
- prod["ask_on_error"] = Popup::ContinueCancel( sformat(_("Please make the add-on \"%1\" available via \"%2\""), prod["product"]:"" ,media) );
+ } else if( (srcid == -1 || srcid == nil) && prod["ask_on_error"]:false) {
+ prod["ask_on_error"] = Popup::ContinueCancel (
+ sformat (_("Please make the add-on \"%1\" available via \"%2\""), prod["product"]:"", media)
+ );
+ }
+
sources[media, pth] = srcid;
+ y2milestone ("New source ID: %1", srcid);
+
// bugzilla #260613
if (srcid != -1)
AddOnProduct::Integrate (srcid);
- AutoinstGeneral::SetSignatureHandling(); // reset to global sig-handling
- } while (sources[media, pth]:-1 == -1 && prod["ask_on_error"]:false);
+ // reset to global sig-handling
+ AutoinstGeneral::SetSignatureHandling();
+
+ } while (sources[media, pth]:-1 == -1 && prod["ask_on_error"]:false == true);
+
prod["media"] = sources[media, pth]:-1;
- Pkg::ResolvableInstall (prod["product"]:"", `product);
+
+ // Adjust "name", bnc #434708
+ if (srcid != nil && srcid != -1) {
+ list