[yast-commit] r64212 - in /branches/SuSE-Code-11-SP2-Branch/add-on: MAINTAINER VERSION package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.desktop src/add-on_auto.ycp - YaST Commits

3 Jun 2011

Author: locilka
Date: Fri Jun  3 15:44:50 2011
New Revision: 64212

URL: http://svn.opensuse.org/viewcvs/yast?rev=64212&view=rev
Log:
- Added support for clonning system configuration (used add-on
  products) (FATE #311374).
- 2.17.22


Modified:
    branches/SuSE-Code-11-SP2-Branch/add-on/MAINTAINER
    branches/SuSE-Code-11-SP2-Branch/add-on/VERSION
    branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes
    branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp
    branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on.desktop
    branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/MAINTAINER
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/MAINTAINER?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================

--- branches/SuSE-Code-11-SP2-Branch/add-on/MAINTAINER (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/MAINTAINER Fri Jun  3 15:44:50 2011
@@ -1 +1 @@
-Lukas Ocilka 
+Ladislav Slezak 

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/VERSION?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/add-on/VERSION (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/VERSION Fri Jun  3 15:44:50 2011
@@ -1 +1 @@
-2.17.21
+2.17.22

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes Fri Jun  3 15:44:50 2011
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Jun  3 15:41:23 CEST 2011 - locilka@suse.cz
+
+- Added support for clonning system configuration (used add-on
+  products) (FATE #311374).
+- 2.17.22
+
+-------------------------------------------------------------------
 Mon Jul 13 11:06:02 CEST 2009 - locilka@suse.cz
 
 - Recalculating layout after redrawing the list of currently used

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp Fri Jun  3 15:44:50 2011
@@ -1231,7 +1231,7 @@
     return ret;
 }
 
-void RedrawAddOnsOverviewTable () {
+list  > GetAllProductsInfo () {
     list  > all_products = Pkg::ResolvableProperties ("", `product, "");
 
     all_products = maplist (map  one_product, all_products, {
@@ -1245,14 +1245,11 @@
 	return one_product;
     });
 
-    integer source_nr = nil;
-    map repository_info = nil;
-    integer counter = -1;
-
-    list <term> products = [];
-    product_infos = $[];
+    return all_products;
+}
 
-    list  > installed_products = filter (map  one_product, all_products, {
+list  > GetInstalledProducts () {
+    list  > installed_products = filter (map  one_product, GetAllProductsInfo(), {
 	// Do not list the base product
 	if (one_product["category"]:"addon" == "base")
 	    return false;
@@ -1260,6 +1257,18 @@
 	return (one_product["status"]:`unknown == `installed || one_product["status"]:`unknown == `selected);
     });
 
+    return installed_products;
+}
+
+map GetProductInfos () {
+    list  > all_products = GetAllProductsInfo();
+    list  > installed_products = GetInstalledProducts();
+
+    map repository_info = nil;
+    integer counter = -1;
+
+    product_infos = $[];
+
     foreach (map  one_product, installed_products, {
 	// only add-on products should be listed
 	if (haskey (one_product, "type") && one_product["type"]:"addon" != "addon") {
@@ -1280,11 +1289,74 @@
 	    "product" : one_product,
 	    "info" : repository_info,
 	];
+    });
+
+    return product_infos;
+}
+
+/**
+ * List of all selected repositories
+ *
+ * @struct add_on_products = [
+ *   $[
+ *     "media" : 4, // ID of the source
+ *     "product_dir" : "/",
+ *     "product" : "openSUSE version XX.Y",
+ *     "autoyast_product" : "'PRODUCT' tag for AutoYaST Export",
+ *     "media_url" : "Zypp URL of the product",
+ *   ],
+ *   ...
+ * ]
+ */
+boolean ReadFromSystem () {
+    AddOnProduct::add_on_products = [];
+
+    map  product_infos = (map ) GetProductInfos();
+    if (product_infos == nil || product_infos == $[]) {
+	y2warning ("No add-on products have been found");
+	return true;
+    }
+
+    integer src_id = nil;
+
+    foreach (string index, map product_desc, product_infos, {
+	src_id = product_desc["info","IDs",0]:-1;
+	if (src_id == nil || src_id == -1) {
+	    y2error ("Cannot get source ID from %1", product_desc);
+	    return;
+	}
+
+	map repo_data = Pkg::SourceGeneralData (src_id);
+
+	AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[
+	    "media"		: src_id,
+	    "product_dir"	: repo_data["product_dir"]:"/",
+	    "product"		: repo_data["name"]:repo_data["alias"]:_("No product found in the repository"),
+	    "autoyast_product"	: product_desc["product","name"]:repo_data["name"]:repo_data["alias"]:_("No product found in the repository"),
+	    "media_url"		: Pkg::SourceURL(src_id)
+	]);
+    });
+
+    y2milestone ("Add-Ons read: %1", AddOnProduct::add_on_products);
+
+    return true;
+}
+
+void RedrawAddOnsOverviewTable () {
+    list <term> products = [];
+
+    map  product_infos = (map ) GetProductInfos();
+
+    if (product_infos == nil)
+	product_infos = $[];
+
+    y2milestone ("Currently used add-ons: %1", product_infos);
 
+    foreach (string index, map product_desc, product_infos, {
 	products = add (products, `item (
-	    `id (sformat ("product_%1", counter)),
-	    one_product["display_name"]:one_product["name"]:_("Unknown product"),
-	    repository_info["URLs", 0]:_("Unknown URL")
+	    `id (sformat ("product_%1", index)),
+	    product_desc["product", "display_name"]:product_desc["product", "name"]:_("Unknown product"),
+	    product_desc["info", "URLs", 0]:_("Unknown URL")
 	));
     });
 
@@ -1292,7 +1364,7 @@
     AdjustInfoWidget();
 
     // Nothing to do delete when there are no product listed
-    UI::ChangeWidget (`id(`delete), `Enabled, (size (installed_products) > 0));
+    UI::ChangeWidget (`id(`delete), `Enabled, (size (products) > 0));
 }
 
 boolean RunPackageSelector () {

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on.desktop
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on.desktop?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on.desktop (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on.desktop Fri Jun  3 15:44:50 2011
@@ -17,6 +17,7 @@
 X-SuSE-YaST-AutoInstResource=
 X-SuSE-YaST-AutoInstPath=install
 X-SuSE-YaST-AutoInstSchema=add-on.rnc
+X-SuSE-YaST-AutoInstClonable=true
 
 Icon=yast-addon
 Exec=/sbin/yast2 add-on

Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp?rev=64212&r1=64211&r2=64212&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp Fri Jun  3 15:44:50 2011
@@ -26,6 +26,8 @@
 import "PackageCallbacksInit";
 import "Label";
 import "AutoinstGeneral";
+import "PackageLock";
+import "Installation";
 
 include "add-on/add-on-workflow.ycp";
 
@@ -243,12 +245,26 @@
     ret = true;
 }
 /**
- * Read configuration data
- * return boolean
+ * Reads configuration of add-ons from the current system
+ * to memory. To get that configuration, use Export() functionality.
+ *
+ * @returns boolean
  */
 else if (func == "Read") {
-    y2milestone ("Read not supported");
-    ret = true;
+    if (! PackageLock::Check()) {
+	y2error ("Cannot get package lock");
+	return false;
+    }
+    y2milestone ("Reseting Pkg");
+    Pkg::PkgApplReset();
+    Pkg::PkgReset();
+
+    Pkg::TargetInitialize (Installation::destdir);
+    Pkg::TargetLoad();
+    Pkg::SourceStartManager (true);
+    Pkg::PkgSolve (true);
+
+    ret = ReadFromSystem();
 }
 /* unknown function */
 else {

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

    

[yast-commit] r64212 - in /branches/SuSE-Code-11-SP2-Branch/add-on: MAINTAINER VERSION package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.desktop src/add-on_auto.ycp

locilka＠svn2.opensuse.org

tags

participants (1)