Author: dmacvicar Date: Sun Apr 13 03:10:05 2008 New Revision: 9581 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9581&view=rev Log: make zypp-query-pool compile, but dont install yet Modified: trunk/libzypp/tools/CMakeLists.txt trunk/libzypp/tools/registration/CMakeLists.txt trunk/libzypp/tools/registration/zypp-query-pool.cc Modified: trunk/libzypp/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/CMakeLists.txt?rev=9581&r1=9580&r2=9581&view=diff ============================================================================== --- trunk/libzypp/tools/CMakeLists.txt (original) +++ trunk/libzypp/tools/CMakeLists.txt Sun Apr 13 03:10:05 2008 @@ -1,4 +1,4 @@ -#ADD_SUBDIRECTORY( registration ) +ADD_SUBDIRECTORY( registration ) ADD_SUBDIRECTORY( package-manager ) #ADD_SUBDIRECTORY( cachetools ) -#ADD_SUBDIRECTORY( migrate-sources ) \ No newline at end of file +#ADD_SUBDIRECTORY( migrate-sources ) Modified: trunk/libzypp/tools/registration/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/registration/CMakeLists.txt?rev=9581&r1=9580&r2=9581&view=diff ============================================================================== --- trunk/libzypp/tools/registration/CMakeLists.txt (original) +++ trunk/libzypp/tools/registration/CMakeLists.txt Sun Apr 13 03:10:05 2008 @@ -7,4 +7,4 @@ TARGET_LINK_LIBRARIES( zypp-query-pool xml2 ) TARGET_LINK_LIBRARIES( zypp-query-pool ${SATSOLVER_LIBRARY} ) -INSTALL(TARGETS zypp-query-pool RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) \ No newline at end of file +#INSTALL(TARGETS zypp-query-pool RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) Modified: trunk/libzypp/tools/registration/zypp-query-pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/registration/zypp-query-pool.cc?rev=9581&r1=9580&r2=9581&view=diff ============================================================================== --- trunk/libzypp/tools/registration/zypp-query-pool.cc (original) +++ trunk/libzypp/tools/registration/zypp-query-pool.cc Sun Apr 13 03:10:05 2008 @@ -30,7 +30,7 @@ : _repository( repository ) { } - bool operator()( PoolItem_Ref item ) + bool operator()( PoolItem item ) { if (_repository.empty() || _repository == item->repository().info().alias()) @@ -69,7 +69,6 @@ if (filter == "packages") kind = ResTraitszypp::Package::kind; else if (filter == "patches") kind = ResTraitszypp::Patch::kind; else if (filter == "patterns") kind = ResTraitszypp::Pattern::kind; - else if (filter == "selections") kind = ResTraitszypp::Selection::kind; else if (filter == "products") kind = ResTraitszypp::Product::kind; else if (filter != FILTER_ALL) { @@ -101,7 +100,7 @@ MIL << "Must build cache..." << repo << endl; repoManager.buildCache( repo ); } - Z->addResolvables( repoManager.createFromCache( repo ).resolvables() ); + repoManager.loadFromCache( repo ); } MIL << "Loaded enabled repositories." << endl; } @@ -114,23 +113,9 @@ } // add resolvables from the system - if ( filter != FILTER_ALL ) - { - MIL << "Loading target (" << kind << ")..." << endl; - ResStore items; - for (ResStore::resfilter_const_iterator it = Z->target()->byKindBegin(kind); it != Z->target()->byKindEnd(kind); ++it) - { - SEC << *it << endl; - items.insert(*it); - } - Z->addResolvables( items, true ); - } - else - { - // no filter, just add themm all - MIL << "Loading target..." << endl; - Z->addResolvables( Z->target()->resolvables(), true ); - } + MIL << "Loading target..." << endl; + Z->target()->load(); + MIL << "Loaded target." << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org