[yast-commit] r64302 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp

Author: locilka Date: Fri Jun 10 09:38:51 2011 New Revision: 64302 URL: http://svn.opensuse.org/viewcvs/yast?rev=64302&view=rev Log: - Added support for add_on_products[.xml] also in inst-sys (FATE #312263). File need to be in the root of inst-sys. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=64302&r1=64301&r2=64302&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Jun 10 09:38:51 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 10 09:34:21 CEST 2011 - locilka@suse.cz + +- Added support for add_on_products[.xml] also in inst-sys + (FATE #312263). File need to be in the root of inst-sys. + +------------------------------------------------------------------- Fri Jun 3 11:47:24 CEST 2011 - locilka@suse.cz - Enhanced AddOnProduct Import functionality (FATE #311374) Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=64302&r1=64301&r2=64302&view=diff ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Fri Jun 10 09:38:51 2011 @@ -1362,22 +1362,25 @@ Integrate (src); // adding the product to the list of products (BNC #269625) - map prod = (map ) Pkg::SourceProductData (src); + map prod = (map ) Pkg::SourceProductData (src); + y2milestone ("Repository (%1) product data: %2", src, prod); + + InstallProductsFromRepository (one_product["install_products"]:[], src); AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : src, - "product" : prod["label"]:prod["productname"]:prod["productversion"]:"", - "autoyast_product" : prod["productname"]:"", + "product" : one_product["name"]:prod["label"]:prod["productname"]:_("Unknown Product"), + "autoyast_product" : prod["productname"]:one_product["name"]:_("Unknown Product"), "media_url" : url, "product_dir" : pth, ]); - - InstallProductsFromRepository (one_product["install_products"]:[], src); }); }); // reread agents, redraw wizard steps, etc. ReIntegrateFromScratch(); + + return true; } /* Export/Import --> */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org