Author: lslezak Date: Thu Nov 6 09:57:36 2008 New Revision: 52962 URL: http://svn.opensuse.org/viewcvs/yast?rev=52962&view=rev Log: - return more data (URL lists) in Pkg::SourceProductData() (bnc#441917) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc trunk/pkg-bindings/src/Source_Get.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=52962&r1=52961&r2=52962&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Nov 6 09:57:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 6 09:58:09 CET 2008 - lslezak@suse.cz + +- return more data (URL lists) in Pkg::SourceProductData() + (bnc#441917) + +------------------------------------------------------------------- Mon Nov 3 14:52:43 CET 2008 - lslezak@suse.cz - use AutoIndexes zypp::Fetcher feature, fixed signed file Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Properties.cc?rev=52962&r1=52961&r2=52962&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Thu Nov 6 09:57:36 2008 @@ -53,7 +53,7 @@ YCPList ret; for_( it, urls_r.begin(), urls_r.end() ) { - ret->add( YCPString(it->asString()) ); + ret->add( YCPString(it->asCompleteString()) ); } return ret; } @@ -91,6 +91,7 @@ + "extra_urls" + "optional_urls" + "register_urls" + + "relnotes_urls" + "smolt_urls" + "register_target" + "register_release" @@ -293,12 +294,7 @@ info->add(YCPString("short_name"), YCPString(product_summary)); } - YCPList updateUrls; - zypp::Product::UrlList pupdateUrls = product->updateUrls(); - for_( it, pupdateUrls.begin(), pupdateUrls.end() ) - { - updateUrls->add(YCPString(it->asString())); - } + YCPList updateUrls(asYCPList(product->updateUrls())); info->add(YCPString("update_urls"), updateUrls); YCPList flags; @@ -334,6 +330,12 @@ info->add(YCPString("smolt_urls"), smoltUrls); } + YCPList relNotesUrls(asYCPList(product->releaseNotesUrls())); + if ( relNotesUrls.size() ) + { + info->add(YCPString("relnotes_urls"), relNotesUrls); + } + // registration data info->add(YCPString("register_target"), YCPString(product->registerTarget())); info->add(YCPString("register_release"), YCPString(product->registerRelease())); Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?rev=52962&r1=52961&r2=52962&view=diff ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Thu Nov 6 09:57:36 2008 @@ -272,6 +272,9 @@ return data; } +// defined in Resolvable_Properties.cc +inline YCPList asYCPList( const zypp::Product::UrlList & urls_r ); + /**************************************************************************************** * @builtin SourceProductData * @short Return Product data about the source @@ -281,11 +284,17 @@ * * <code> * $[ - * "label" : YCPString, - * "vendor" : YCPString, - * "productname" : YCPString, - * "productversion" : YCPString, - * "relnotesurl" : YCPString, + * "label" : string, + * "vendor" : string, + * "productname" : string, + * "productversion" : string, + * "relnotesurl" : string, + * "relnotes_urls" : list<string> + * "register_urls" : list<string> + * "smolt_urls" : list<string> + * "update_urls" : list<string> + * "extra_urls" : list<string> + * "optional_urls" : list<string> * ]; * </code> * @@ -330,6 +339,13 @@ ret->add( YCPString("productname"), YCPString( product->name() ) ); ret->add( YCPString("productversion"), YCPString( product->edition().version() ) ); ret->add( YCPString("relnotesurl"), YCPString( product->releaseNotesUrls().first().asString())); + + ret->add( YCPString("relnotes_urls"), asYCPList(product->releaseNotesUrls())); + ret->add( YCPString("register_urls"), asYCPList(product->registerUrls())); + ret->add( YCPString("smolt_urls"), asYCPList(product->smoltUrls())); + ret->add( YCPString("update_urls"), asYCPList(product->updateUrls())); + ret->add( YCPString("extra_urls"), asYCPList(product->extraUrls())); + ret->add( YCPString("optional_urls"), asYCPList(product->optionalUrls())); break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org