Author: locilka Date: Fri Jun 1 16:11:33 2007 New Revision: 38248 URL: http://svn.opensuse.org/viewcvs/yast?rev=38248&view=rev Log: - Fixed Add-On client to provide command-line again. Providing "help" and "longhelp" (#279074). - Fixed Add-On workflow to store the "PRODUCT" tag from content file for later usage in AutoYaST cloning (#279893). - 2.15.9 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=38248&r1=38247&r2=38248&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Jun 1 16:11:33 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=38248&r1=38247&r2=38248&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jun 1 16:11:33 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jun 1 15:35:46 CEST 2007 - locilka@suse.cz + +- Fixed Add-On client to provide command-line again. Providing + "help" and "longhelp" (#279074). +- Fixed Add-On workflow to store the "PRODUCT" tag from content + file for later usage in AutoYaST cloning (#279893). +- 2.15.9 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=38248&r1=38247&r2=38248&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jun 1 16:11:33 2007 @@ -634,11 +634,13 @@ } Pkg::ResolvableInstall (prod["name"]:"", `product); map data = Pkg::SourceGeneralData (AddOnProduct::src_id); + string url = data["url"]:""; string product_dir = data["product_dir"]:""; AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id, "product" : prod["display_name"]:prod["short_name"]:prod["name"]:"", + "autoyast_product" : prod["name"]:"", "media_url" : url, "product_dir" : product_dir, ]); @@ -754,11 +756,12 @@ } foreach (string product, selected, { + integer src_id = (AddOnProduct::src_id == -1 ? prod2src[product]:-1 : AddOnProduct::src_id); + AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ - "media" : AddOnProduct::src_id == -1 - ? prod2src[product]:-1 - : AddOnProduct::src_id, + "media" : src_id, "product" : product, + "autoyast_prouduct" : product, "media_url" : url, "product_dir" : product_dir, ]); Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=38248&r1=38247&r2=38248&view=diff ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Fri Jun 1 16:11:33 2007 @@ -21,14 +21,31 @@ include "add-on/add-on-workflow.ycp"; - -// Bugzilla #269886, CommanLine "support" -// argmap is only a map, CommandLine uses string parameters -if (size (GetInstArgs::argmap()) == 0 && size (WFM::Args()) > 0) { +list wfm_args = WFM::Args(); +y2milestone ("ARGS: %1", wfm_args); +if ( + (size (wfm_args) > 0) + && + (contains (wfm_args, "help") || contains (wfm_args, "longhelp")) +) { Mode::SetUI ("commandline"); - y2milestone ("Mode CommandLine not supported, exiting..."); - // TRANSLATORS: error message - the module does not provide command line interface - CommandLine::Print(_("There is no user interface available for this module.")); + // TRANSLATORS: commandline help + CommandLine::Print(_(" +Add-On Module Help +------------------ + +To add a new Add-On product via command-line, use this syntax: + /sbin/yast2 add-on URL +URL is the path to the Add-On source. + +Examples of URL: +http://server.name/directory/Lang-AddOn-10.2-i386/ +ftp://server.name/directory/Lang-AddOn-10.2-i386/ +nfs://server.name/directory/SDK1-SLE-i386/ +disk://dev/sda5/directory/Product/CD1/ +cd:// +dvd:// +")); return `auto; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org