Author: locilka Date: Fri Jun 1 16:04:52 2007 New Revision: 38246 URL: http://svn.opensuse.org/viewcvs/yast?rev=38246&view=rev Log: - Adjusted Add-On module to store also a "PRODUCT" tag from the product content file to be later used by AutoYaST cloning. - Add-On Export uses that "autoyast_product" ("PRODUCT") instead of the "product" key which is used for other purposes, mostly for UI (#279893). 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=38246&r1=38245&r2=38246&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Jun 1 16:04:52 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jun 1 15:58:06 CEST 2007 - locilka@suse.cz + +- Adjusted Add-On module to store also a "PRODUCT" tag from the + product content file to be later used by AutoYaST cloning. +- Add-On Export uses that "autoyast_product" ("PRODUCT") instead of + the "product" key which is used for other purposes, mostly for + UI (#279893). + +------------------------------------------------------------------- Wed May 30 14:16:09 CEST 2007 - lslezak@suse.cz - do not show an installation source in the package installation Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=38246&r1=38245&r2=38246&view=diff ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Fri Jun 1 16:04:52 2007 @@ -61,6 +61,7 @@ * "media" : 4, // ID of the source * "product_dir" : "/", * "product" : "openSUSE version XX.Y", + * "autoyast_product" : "'PRODUCT' tag for AutoYaST Export", * ], * ... * ] @@ -520,6 +521,7 @@ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : src, "product" : prod["label"]:prod["productname"]:prod["productversion"]:"", + "autoyast_product" : prod["productname"]:"", "media_url" : url, "product_dir" : pth, ]); @@ -548,12 +550,41 @@ /* Export/Import --> */ +/** + * Returns map describing all used add-ons. + * + * @return map + * + * @struct This is an XML file created from exported map: + * <add-on> + * + * <listentry> + * ftp://server.name/.../ + * <product>NEEDS_TO_MATCH_"PRODUCT"_TAG_FROM_content_FILE!</product> + * / + * </listentry> + * ... + * + * </add-on> + */ global map Export () { + y2milestone ("Add-Ons Input: %1", add_on_products); + list > exp = maplist (map p, add_on_products, { if (haskey (p, "media")) p = remove (p, "media"); + + // bugzilla #279893 + if (haskey (p, "autoyast_product")) { + p["product"] = p["autoyast_product"]:""; + p = remove (p, "autoyast_product"); + } + return p; }); + + y2milestone ("Add-Ons Output: %2", exp); + return $[ "add_on_products" : exp, ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org