[yast-commit] r38234 - in /branches/SuSE-SLE-10-SP1-Branch/installation: VERSION package/yast2-installation.changes src/modules/AddOnProduct.ycp

1 Jun 2007

Author: locilka
Date: Fri Jun  1 11:14:19 2007
New Revision: 38234

URL: http://svn.opensuse.org/viewcvs/yast?rev=38234&view=rev
Log:
- Fixed Add-Ons for AutoYaST Export function to write PRODUCT
  content tag file into the "product" tag in AutoYaST profile
  (#276309).
- 2.13.193


Modified:
    branches/SuSE-SLE-10-SP1-Branch/installation/VERSION
    branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes
    branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp

Modified: branches/SuSE-SLE-10-SP1-Branch/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/VERSION?rev=38234&r1=38233&r2=38234&view=diff
==============================================================================

--- branches/SuSE-SLE-10-SP1-Branch/installation/VERSION (original)
+++ branches/SuSE-SLE-10-SP1-Branch/installation/VERSION Fri Jun  1 11:14:19 2007
@@ -1 +1 @@
-2.13.192
+2.13.193

Modified: branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes?rev=38234&r1=38233&r2=38234&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes Fri Jun  1 11:14:19 2007
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri Jun  1 11:05:30 CEST 2007 - locilka@suse.cz
+
+- Fixed Add-Ons for AutoYaST Export function to write PRODUCT
+  content tag file into the "product" tag in AutoYaST profile
+  (#276309).
+- 2.13.193
+
+-------------------------------------------------------------------
 Mon May 14 09:05:34 CEST 2007 - jsrain@suse.cz
 
 - Fixed Add-Ons in AutoYaST Write function to Integrate all Add-Ons

Modified: branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp?rev=38234&r1=38233&r2=38234&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp Fri Jun  1 11:14:19 2007
@@ -31,6 +31,7 @@
 import "ProductLicense";
 import "FileUtils";
 import "Directory";
+import "Installation";
 
 // variables for installation with product
 /**
@@ -1232,11 +1233,55 @@
 }
 
 global map Export () {
-    list > exp = maplist (map p, add_on_products, {
+    // See bugzilla #276309
+
+    /*
+     * Returns map like this one
+     *
+     * <add-on>
+     *   
+     *     <listentry>
+     *       ftp://server.name/.../
+     *       <product>NEEDS_TO_MATCH_"PRODUCT"_TAG_FROM_content_FILE!</product>
+     *       /
+     *     </listentry>
+     *     ...
+     *   
+     * </add-on>
+     */
+
+    // Just to make sure everything is initialized properly
+    Pkg::TargetInitialize (Installation::destdir);
+    Pkg::TargetLoad();
+
+    // Get list of currently installed products
+    list  > products = Pkg::ResolvableProperties ("", `product, "");
+
+    list  > exp = maplist (map p, add_on_products, {
 	if (haskey (p, "media"))
 	    p = remove (p, "media");
+
+        y2milestone ("Fixing product: %1", p);
+
+	// Try to match the product "display_name" or "short_name"
+	// with "product" of the exported Add-On
+        foreach (map prod, products, {
+            y2milestone ("Trying... Product resolvable: %1", prod);
+            if (prod["display_name"]:"" == p["product"]:"___no_product_name_"
+                || prod["short_name"]:"" == p["product"]:"___no_product_name_")
+            {
+                y2milestone ("Passed");
+                p["product"] = prod["name"]:"";
+		// We do not need further testing for this product
+		break;
+            }
+        });
+
+        y2milestone ("Product to save: %1", p);
+
 	return p;
     });
+
     return $[
 	"add_on_products" : exp,
     ];

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r38234 - in /branches/SuSE-SLE-10-SP1-Branch/installation: VERSION package/yast2-installation.changes src/modules/AddOnProduct.ycp

locilka＠svn.opensuse.org