Author: mlandres Date: Thu Aug 7 17:15:02 2008 New Revision: 49835 URL: http://svn.opensuse.org/viewcvs/yast?rev=49835&view=rev Log: - Adapt to new product handling. Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/Resolvable_Install.cc trunk/pkg-bindings/src/Resolvable_Properties.cc trunk/pkg-bindings/src/Selection.cc trunk/pkg-bindings/src/Source_Get.cc trunk/pkg-bindings/src/Target.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Aug 7 17:15:02 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 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=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 7 17:15:02 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 7 17:13:38 CEST 2008 - ma@suse.de + +- Adapt to new product handling. +- 2.17.5 + +------------------------------------------------------------------- Tue Aug 5 14:55:43 CEST 2008 - lslezak@suse.cz - fixed searching for the candidate package - prefer better @@ -16,7 +22,7 @@ - allow priority >99 in Pkg::SourceSet() (bnc#402135) ------------------------------------------------------------------- -Wed Jul 23 16:12:56 CEST 2008 ma@suse.de +Wed Jul 23 16:12:56 CEST 2008 - ma@suse.de - Remove references to obsolete freshens dependencies. - 2.17.3 Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Thu Aug 7 17:15:02 2008 @@ -755,7 +755,7 @@ { if (tags->value(i)->isString()) { - DoProvideNameKind (tags->value(i)->asString()->value(), zypp::ResTraitszypp::Package::kind, zypp::ZConfig::instance().systemArchitecture(), ""); + DoProvideNameKind (tags->value(i)->asString()->value(), zypp::ResKind::package, zypp::ZConfig::instance().systemArchitecture(), ""); } else { @@ -796,7 +796,7 @@ { if (tags->value(i)->isString()) { - DoRemoveNameKind( tags->value(i)->asString()->value(), zypp::ResTraitszypp::Package::kind); + DoRemoveNameKind( tags->value(i)->asString()->value(), zypp::ResKind::package); } else { @@ -1323,8 +1323,8 @@ { try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Package::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Package::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { // return true if there is a package installed/removed by user @@ -1360,8 +1360,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Package::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Package::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (it->status().isToBeUninstalled()) @@ -1397,8 +1397,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Package::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Package::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (it->status().isToBeInstalled()) @@ -1466,8 +1466,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Package::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Package::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { // check status and causer @@ -1517,8 +1517,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Package::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Package::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (which == "installed") @@ -1726,7 +1726,7 @@ // ensure installation of the 'best' architecture - return YCPBoolean( DoProvideNameKind( name, zypp::ResTraitszypp::Package::kind, zypp::ZConfig::instance().systemArchitecture(), "") ); + return YCPBoolean( DoProvideNameKind( name, zypp::ResKind::package, zypp::ZConfig::instance().systemArchitecture(), "") ); } /** @@ -1746,7 +1746,7 @@ // ensure installation of the 'best' architecture - return YCPBoolean( DoProvideNameKind( name, zypp::ResTraitszypp::SrcPackage::kind, zypp::ZConfig::instance().systemArchitecture(), "" ) ); + return YCPBoolean( DoProvideNameKind( name, zypp::ResKind::srcpackage, zypp::ZConfig::instance().systemArchitecture(), "" ) ); } Modified: trunk/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Install.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Install.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Install.cc Thu Aug 7 17:15:02 2008 @@ -60,16 +60,16 @@ zypp::Arch architecture(arch_str); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else { @@ -102,16 +102,16 @@ std::string req_kind = kind_r->symbol (); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else { @@ -157,16 +157,16 @@ std::string req_kind = kind_r->symbol (); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else { @@ -200,16 +200,16 @@ bool force = force_r->value(); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else { @@ -266,16 +266,16 @@ std::string name = name_r->value(); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else { Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Properties.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Thu Aug 7 17:15:02 2008 @@ -107,24 +107,16 @@ YCPList ret; if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; -/* - zypp::ResPool pool( zypp::ResPool::instance() ); - - for_( it, pool.satisfiedProductsBegin(), pool.satisfiedProductsEnd() ) - { - zypp::Product_constPtr p( asKind<Product>(*it) ); - } -*/ + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else if ( req_kind == "language" ) { @@ -410,16 +402,16 @@ std::string stat_str = status->symbol(); if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; + kind = zypp::ResKind::pattern; } else if ( req_kind == "any" ) { try Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Thu Aug 7 17:15:02 2008 @@ -35,7 +35,6 @@ #include #include -#include #include using std::string; @@ -110,9 +109,9 @@ try { - for (zypp::ResPool::byKind_iterator it - = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Pattern::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Pattern::kind) ; ++it ) + for (zypp::ResPool::byKind_iterator it + = zypp_ptr()->pool().byKindBegin(zypp::ResKind::pattern); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::pattern) ; ++it ) { std::string pattern; @@ -209,7 +208,7 @@ if ( it != zypp_ptr()->pool().byIdentEndzypp::Pattern(name) ) { - zypp::Pattern::constPtr pattern = + zypp::Pattern::constPtr pattern = zypp::dynamic_pointer_cast<const zypp::Pattern>(it->resolvable ()); // pattern found @@ -347,7 +346,7 @@ @short Activate all selected selections - obsoleted, use PkgSolve() instead @return boolean true - + @deprecated Use Pkg::PkgSolve instead, selections are solvable now */ YCPBoolean Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Thu Aug 7 17:15:02 2008 @@ -279,9 +279,9 @@ try { // find a product for the given source - zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Product::kind); + zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::product); - for( ; it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Product::kind) ; ++it) + for( ; it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::product) ; ++it) { zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>( it->resolvable() ); @@ -304,7 +304,7 @@ } } - if( it == zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Product::kind) ) + if( it == zypp_ptr()->pool().byKindEnd(zypp::ResKind::product) ) { y2error ("Product for source '%lld' not found", src_id->value()); } Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=49835&r1=49834&r2=49835&view=diff ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Thu Aug 7 17:15:02 2008 @@ -184,8 +184,10 @@ { zypp::ResPool pool( zypp::ResPool::instance() ); // ResPool is a global singleton - for_( it, pool.satisfiedProductsBegin(), pool.satisfiedProductsEnd() ) + for_( it, pool.byKindBeginzypp::Product(), pool.byKindEndzypp::Product() ) { + if ( ! it->status().isInstalled() ) + continue; zypp::Product::constPtr product = asKindzypp::Product( it->resolvable() ); #warning TargetProducts does not return all keys -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org