Author: coolo Date: Fri Feb 15 11:46:16 2008 New Revision: 44491 URL: http://svn.opensuse.org/viewcvs/yast?rev=44491&view=rev Log: Duncan's port to latest libzypp Modified: trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Locale.cc trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgFunctions.h 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_Resolvables.cc trunk/pkg-bindings/src/Target.cc trunk/pkg-bindings/src/Target_Load.cc Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Fri Feb 15 11:46:16 2008 @@ -31,11 +31,12 @@ #include "Callbacks.YCP.h" // PkgFunctions::CallbackHandler::YCPCallbacks #include "GPGMap.h" -#include -#include -#include -#include -#include +#include "zypp/ZYppCallbacks.h" +#include "zypp/Package.h" +#include "zypp/Patch.h" +#include "zypp/KeyRing.h" +#include "zypp/PublicKey.h" +#include "zypp/Digest.h" // FIXME: do this nicer, source create use this to avoid user feedback // on probing of source type Modified: trunk/pkg-bindings/src/Locale.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Locale.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Locale.cc (original) +++ trunk/pkg-bindings/src/Locale.cc Fri Feb 15 11:46:16 2008 @@ -75,7 +75,7 @@ zypp::Locale loc = zypp::Locale(locale->value()); // add packages for the preferred locale, preserve additional locales - zypp::ZYpp::LocaleSet lset = zypp_ptr()->getRequestedLocales(); + zypp::LocaleSet lset = zypp_ptr()->getRequestedLocales(); // remove the previous locale if (preferred_locale != zypp::Locale::noCode) @@ -180,7 +180,7 @@ YCPValue PkgFunctions::SetAdditionalLocales (const YCPList &langycplist) { - zypp::ZYpp::LocaleSet lset; + zypp::LocaleSet lset; int i = 0; while (i < langycplist->size()) @@ -228,9 +228,9 @@ try { - zypp::ZYpp::LocaleSet lset = zypp_ptr()->getRequestedLocales(); + zypp::LocaleSet lset = zypp_ptr()->getRequestedLocales(); - for (zypp::ZYpp::LocaleSet::const_iterator it = lset.begin(); + for (zypp::LocaleSet::const_iterator it = lset.begin(); it != lset.end(); ++it) { // ignore the main locale Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Feb 15 11:46:16 2008 @@ -44,7 +44,7 @@ #include #include #include -#include +//#include #include <fstream> #include <sstream> @@ -392,7 +392,7 @@ struct CaIMatch { - zypp::PoolItem_Ref item; + zypp::PoolItem item; bool operator() (const zypp::CapAndItem & cai ) { @@ -603,7 +603,7 @@ struct ProvideProcess { - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Arch _architecture; zypp::ResStatus::TransactByValue whoWantsIt; std::string version; @@ -858,9 +858,9 @@ struct ItemMatch { - zypp::PoolItem_Ref item; + zypp::PoolItem item; - bool operator() (const zypp::PoolItem_Ref i ) + bool operator() (const zypp::PoolItem i ) { item = i; return false; @@ -868,7 +868,7 @@ }; static zypp::Package::constPtr -find_package( const string & name, zypp::PoolItem_Ref & item, zypp::ResPool pool ) +find_package( const string & name, zypp::PoolItem & item, zypp::ResPool pool ) { if (name.empty()) return NULL; @@ -882,7 +882,7 @@ pool.byNameEnd( name ), zypp::functor::chain( zypp::resfilter::ByUninstalled(), zypp::resfilter::ByKind( zypp::ResTraitszypp::Package::kind ) ), - zypp::functor::functorRef( match ) ); + zypp::functor::functorRef( match ) ); // if no match yet, try again with installed package // (but those only provide an english summary) @@ -892,7 +892,7 @@ pool.byNameEnd( name ), zypp::functor::chain( zypp::resfilter::ByInstalled(), zypp::resfilter::ByKind( zypp::ResTraitszypp::Package::kind ) ), - zypp::functor::functorRef( match ) ); + zypp::functor::functorRef( match ) ); } if (!match.item) @@ -920,7 +920,7 @@ { try { - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() ); if (pkg == NULL) @@ -955,7 +955,7 @@ { try { - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() ); if (pkg == NULL) @@ -989,7 +989,7 @@ { try { - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() ); if (pkg == NULL) @@ -1023,7 +1023,7 @@ { try { - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() ); if (pkg == NULL) @@ -1042,7 +1042,7 @@ YCPValue -PkgFunctions::PkgProp( zypp::PoolItem_Ref item ) +PkgFunctions::PkgProp( zypp::PoolItem item ) { YCPMap data; zypp::Package::constPtr pkg = zypp::asKindzypp::Package( item.resolvable() ); @@ -1107,7 +1107,7 @@ try { YCPMap data; - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() ); if (item) @@ -1152,7 +1152,7 @@ YCPValue PkgFunctions::GetPkgLocation (const YCPString& p, bool full_path) { - zypp::PoolItem_Ref item; + zypp::PoolItem item; try { @@ -2107,47 +2107,7 @@ YCPBoolean PkgFunctions::PkgEstablish () { - bool result = false; - - try - { - result = zypp_ptr()->resolver()->establishPool(); - } - catch (const zypp::Exception& excpt) - { - y2error("An error occurred during Pkg::PkgEstablish."); - _last_error.setLastError(excpt.asUserString(), "See /var/log/YaST2/badlist for more information."); - } - - // save information about failed dependencies to file - if (!result) - { - try - { - zypp::ResolverProblemList problems = zypp_ptr()->resolver()->problems(); - int problem_size = problems.size(); - - if (problem_size > 0) - { - y2error ("PkgSolve: %d packages failed (see /var/log/YaST2/badlist)", problem_size); - - std::ofstream out ("/var/log/YaST2/badlist"); - - out << problem_size << " packages failed" << std::endl; - for(zypp::ResolverProblemList::const_iterator p = problems.begin(); - p != problems.end(); ++p ) - { - out << (*p)->description() << std::endl; - } - } - } - catch (...) - { - return YCPBoolean(false); - } - } - - return YCPBoolean(result); + return YCPBoolean(false); } @@ -2167,47 +2127,7 @@ YCPBoolean PkgFunctions::PkgFreshen() { - bool result = false; - - try - { - result = zypp_ptr()->resolver()->freshenPool(); - } - catch (const zypp::Exception& excpt) - { - y2error("An error occurred during Pkg::PkgFreshen."); - _last_error.setLastError(excpt.asUserString(), "See /var/log/YaST2/badlist for more information."); - } - - // save information about failed dependencies to file - if (!result) - { - try - { - zypp::ResolverProblemList problems = zypp_ptr()->resolver()->problems(); - int problem_size = problems.size(); - - if (problem_size > 0) - { - y2error ("PkgSolve: %d packages failed (see /var/log/YaST2/badlist)", problem_size); - - std::ofstream out ("/var/log/YaST2/badlist"); - - out << problem_size << " packages failed" << std::endl; - for(zypp::ResolverProblemList::const_iterator p = problems.begin(); - p != problems.end(); ++p ) - { - out << (*p)->description() << std::endl; - } - } - } - catch (...) - { - return YCPBoolean(false); - } - } - - return YCPBoolean(result); + return YCPBoolean(true); } @@ -2225,30 +2145,21 @@ YCPBoolean PkgFunctions::PkgSolveCheckTargetOnly() { - // create pool just with objects from target - zypp::ResStore store; - try { - store = zypp_ptr()->target()->resolvables(); + zypp_ptr()->target()->load(); } catch (...) { return YCPBoolean(false); } - zypp::ResPoolManager pool; - pool.insert(store.begin(), store.end(), true); - - // create resolver - zypp::Resolver solver(pool.accessor()); - bool result = false; try { // verify consistency of system - result = solver.verifySystem(); + result = zypp_ptr()->resolver()->verifySystem(); } catch (const zypp::Exception& excpt) { @@ -2357,8 +2268,6 @@ resolvable->add (YCPString ("kind"), YCPSymbol ("product")); else if (zypp::isKindzypp::Pattern(it->resolvable())) resolvable->add (YCPString ("kind"), YCPSymbol ("pattern")); - else if (zypp::isKindzypp::Selection(it->resolvable())) - resolvable->add (YCPString ("kind"), YCPSymbol ("selection")); else if (zypp::isKindzypp::Script(it->resolvable())) resolvable->add (YCPString ("kind"), YCPSymbol ("script")); else if (zypp::isKindzypp::Message(it->resolvable())) @@ -2586,7 +2495,7 @@ // get partitioning zypp::DiskUsageCounter::MountPointSet mps = zypp_ptr()->getPartitions(); - zypp::PoolItem_Ref item; + zypp::PoolItem item; zypp::Package::constPtr pkg = find_package(package->value(), item, zypp_ptr()->pool() ); // the package was not found Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Fri Feb 15 11:46:16 2008 @@ -113,7 +113,7 @@ std::string UniqueAlias(const std::string &alias); YCPValue GetPkgLocation(const YCPString& p, bool full_path); - YCPValue PkgProp( zypp::PoolItem_Ref item ); + YCPValue PkgProp( zypp::PoolItem item ); YCPValue PkgMediaSizesOrCount (bool sizes); bool aliasExists(const std::string &alias) const; Modified: trunk/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Install.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Install.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Install.cc Fri Feb 15 11:46:16 2008 @@ -65,9 +65,6 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } @@ -124,9 +121,6 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } @@ -170,9 +164,6 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } @@ -239,9 +230,6 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Properties.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Fri Feb 15 11:46:16 2008 @@ -41,7 +41,6 @@ #include #include -#include /** @builtin ResolvableProperties @@ -51,7 +50,7 @@ return list of resolvables of selected kind with required name @param name name of the resolvable, if empty returns all resolvables of the kind - @param kind_r kind of resolvable, can be `product, `patch, `package, `selection, `pattern or `language + @param kind_r kind of resolvable, can be `product, `patch, `package, `pattern or `language @param version version of the resolvable, if empty all versions are returned @return list> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol, "locked":boolean ] maps @@ -97,15 +96,9 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } - else if ( req_kind == "language" ) { - kind = zypp::ResTraitszypp::Language::kind; - } else { y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); @@ -194,7 +187,9 @@ // product specific info else if( req_kind == "product" ) { zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(it->resolvable()); - info->add(YCPString("category"), YCPString(product->category())); +#warning "Product::category is deprecated, remove from YCP code and this map" + info->add(YCPString("category"), YCPString(product->type())); + info->add(YCPString("type"), YCPString(product->type())); info->add(YCPString("relnotes_url"), YCPString(product->releaseNotesUrl().asString())); std::string product_summary = product->summary(); @@ -295,11 +290,11 @@ { try { zypp::Dep depkind(*kind_it); - zypp::CapSet deps = it->resolvable()->dep(depkind); - for (zypp::CapSet::const_iterator d = deps.begin(); d != deps.end(); ++d) + zypp::Capabilities deps = it->resolvable()->dep(depkind); + for (zypp::Capabilities::const_iterator d = deps.begin(); d != deps.end(); ++d) { YCPMap ycpdep; - ycpdep->add (YCPString ("res_kind"), YCPString (d->refers().asString())); + //FIXME ycpdep->add (YCPString ("res_kind"), YCPString (d.kind().asString())); ycpdep->add (YCPString ("name"), YCPString (d->asString())); ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); ycpdeps->add (ycpdep); @@ -326,7 +321,7 @@ /** @builtin IsAnyResolvable @short Is there any resolvable in the requried state? - @param symbol kind_r kind of resolvable, can be `product, `patch, `package, `selection, `pattern, `language or `any for any kind of resolvable + @param symbol kind_r kind of resolvable, can be `product, `patch, `package, `pattern, `language or `any for any kind of resolvable @param symbol status status of resolvable, can be `to_install or `to_remove @return boolean true if a resolvable with the requested status was found */ @@ -347,15 +342,9 @@ else if ( req_kind == "package" ) { kind = zypp::ResTraitszypp::Package::kind; } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } else if ( req_kind == "pattern" ) { kind = zypp::ResTraitszypp::Pattern::kind; } - else if ( req_kind == "language" ) { - kind = zypp::ResTraitszypp::Language::kind; - } 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=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Fri Feb 15 11:46:16 2008 @@ -36,7 +36,6 @@ #include #include -#include #include using std::string; @@ -70,78 +69,7 @@ YCPValue PkgFunctions::GetSelections (const YCPSymbol& stat, const YCPString& cat) { - string status = stat->symbol(); - string category = cat->value(); - - // FIXME: this should be done more nicely - if ( category == "base" ) - category = "baseconf"; - YCPList selections; - - try - { - for (zypp::ResPool::byKind_iterator it - = zypp_ptr()->pool().byKindBegin(zypp::ResTraitszypp::Selection::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraitszypp::Selection::kind) ; ++it ) - { - string selection; - - if (status == "all") - { - selection = it->resolvable()->name(); - } - else if (status == "available") - { - // ignore installed selections - zypp::Repository src = (*it)->repository(); - - if (src != zypp::Repository::noRepository) - selection = it->resolvable()->name(); - } - else if (status == "selected") - { - if( it->status().isToBeInstalled() ) - selection = it->resolvable()->name(); - } - else if (status == "installed") - { - if( it->status().wasInstalled() ) - selection = it->resolvable()->name(); - } - else - { - y2warning("Unknown status in Pkg::GetSelections(%s, ...)", status.c_str()); - break; - } - - if (selection.empty()) - { - continue; - } - - string selection_cat = zypp::dynamic_pointer_cast<const zypp::Selection>(it->resolvable())->category(); - if (category != "") - { - if ( selection_cat != category) - { - continue; // asked for explicit category - } - } - else // category == "" - { - if (selection_cat == "baseconf") - { - continue; // asked for non-base - } - } - selections->add (YCPString (selection)); - } - } - catch (...) - { - } - return selections; } @@ -355,75 +283,6 @@ PkgFunctions::SelectionData (const YCPString& sel) { YCPMap data; - string name = sel->value(); - - /* TODO FIXME - - data->add (YCPString ("archivesize"), YCPInteger ((long long) (selection->archivesize()))); - - tiny_helper_no1 (&data, "requires", selection->requires ()); - tiny_helper_no1 (&data, "conflicts", selection->conflicts ()); - tiny_helper_no1 (&data, "provides", selection->provides ()); - tiny_helper_no1 (&data, "obsoletes", selection->obsoletes ()); - */ - - try - { - zypp::ResPool::byName_iterator it = std::find_if ( - zypp_ptr()->pool().byNameBegin(name) - , zypp_ptr()->pool().byNameEnd(name) - , zypp::resfilter::ByKind(zypp::ResTraitszypp::Selection::kind) - ); - - if ( it != zypp_ptr()->pool().byNameEnd(name) ) - { - zypp::Selection::constPtr selection = - zypp::dynamic_pointer_cast<const zypp::Selection>(it->resolvable ()); - - // selection found - data->add (YCPString ("summary"), YCPString (selection->summary())); - data->add (YCPString ("category"), YCPString (selection->category())); - data->add (YCPString ("visible"), YCPBoolean (selection->visible())); - data->add (YCPString ("order"), YCPString (selection->order())); - data->add (YCPString ("description"), YCPString (selection->description())); - - /* YCPList recommendslist; - std::setstd::string recommends = selection->recommends(); - - for (std::setstd::string::const_iterator rec = recommends.begin(); - rec != recommends.end(); rec++) - { - if (!((*rec).empty())) - { - recommendslist->add(YCPString(*rec)); - } - } - data->add (YCPString("recommends"), recommendslist); - - YCPList suggestslist; - std::setstd::string suggests = selection->suggests(); - - for (std::setstd::string::const_iterator sug = suggests.begin(); - sug != suggests.end(); sug++) - { - if (!((*sug).empty())) - { - suggestslist->add(YCPString(*sug)); - } - } - data->add (YCPString("suggests"), recommendslist); - */ -#warning Report also archivesize, requires, provides, conflicts and obsoletes - } - else - { - return YCPError ("Selection '" + name + "' not found", data); - } - } - catch (...) - { - } - return data; } @@ -446,46 +305,8 @@ PkgFunctions::SelectionContent (const YCPString& sel, const YCPBoolean& to_delete, const YCPString& lang) { #warning Pkg::SelectionContent to_delete is not supported - YCPList data; - std::string name = sel->value(); - std::string locale = lang->value(); - - try - { - zypp::ResPool::byName_iterator it = std::find_if ( - zypp_ptr()->pool().byNameBegin(name) - , zypp_ptr()->pool().byNameEnd(name) - , zypp::resfilter::ByKind(zypp::ResTraitszypp::Selection::kind) - ); - - if ( it != zypp_ptr()->pool().byNameEnd(name) ) - { - zypp::Selection::constPtr selection = - zypp::dynamic_pointer_cast<const zypp::Selection>(it->resolvable ()); - #warning implemented correctly? - // is it correct? - std::setstd::string inst = selection->install_packages(zypp::Locale(locale)); - - for (std::setstd::string::const_iterator inst_it = inst.begin(); - inst_it != inst.end(); inst_it++) - { - if (!((*inst_it).empty())) - { - data->add(YCPString(*inst_it)); - } - } - } - else - { - return YCPError ("Selection '" + name + "' not found", data); - } - } - catch (...) - { - } - return data; } @@ -506,7 +327,7 @@ YCPBoolean PkgFunctions::SetSelection (const YCPString& selection) { - return DoProvideNameKind( selection->value(), zypp::ResTraitszypp::Selection::kind, zypp_ptr()->architecture(), ""); + return YCPBoolean(false); } // ------------------------ @@ -521,7 +342,7 @@ PkgFunctions::ClearSelection (const YCPString& selection) { y2warning( "Pkg::ClearSelection does not reset add-on selections anymore"); - return YCPBoolean( DoRemoveNameKind( selection->value(), zypp::ResTraitszypp::Selection::kind ) ); + return YCPBoolean(false); } Modified: trunk/pkg-bindings/src/Source_Resolvables.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Resolvables.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Source_Resolvables.cc (original) +++ trunk/pkg-bindings/src/Source_Resolvables.cc Fri Feb 15 11:46:16 2008 @@ -31,6 +31,8 @@ #include #include "log.h" +#include + /* Textdomain "pkg-bindings" */ @@ -41,17 +43,7 @@ void PkgFunctions::RemoveResolvablesFrom(const std::string &alias) { // remove the resolvables if they have been loaded - for (zypp::ResPool::repository_iterator it = zypp_ptr()->pool().knownRepositoriesBegin() - ; it != zypp_ptr()->pool().knownRepositoriesEnd() - ; ++it) - { - if (it->info().alias() == alias) - { - y2internal("Removing resolvables from '%s'", alias.c_str()); - zypp_ptr()->removeResolvables(it->resolvables()); - return; - } - } + zypp::sat::Pool::instance().reposErase(alias); } /* @@ -106,13 +98,8 @@ repomanager.buildCache(repoinfo, zypp::RepoManager::BuildIfNeeded, load_subprogress); } - zypp::Repository repository = repomanager.createFromCache(repoinfo); - const zypp::ResStore &store = repository.resolvables(); - - // load resolvables - zypp_ptr()->addResolvables(store); - - y2milestone("Loaded %zd resolvables", store.size()); + repomanager.loadFromCache(repoinfo); + //y2milestone("Loaded %zd resolvables", store.size()); } catch(const zypp::repo::RepoNotCachedException &excpt ) { Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Fri Feb 15 11:46:16 2008 @@ -34,7 +34,6 @@ #include #include -#include #include "log.h" @@ -180,58 +179,64 @@ try { - for (ResStore::resfilter_const_iterator it = zypp_ptr()->target()->byKindBegin(ResTraits<Product>::kind); it != zypp_ptr()->target()->byKindEnd(ResTraits<Product>::kind); ++it) + for (ResPool::const_iterator it = zypp_ptr()->pool().begin(); it != zypp_ptr()->pool().end(); ++it) { - zypp::Product::constPtr product = asKind<const zypp::Product>( *it ); -#warning TargetProducts does not return all keys - YCPMap prod; - // see also PkgFunctions::Descr2Map and Product.ycp::Product -// FIXME unify with code in Pkg::ResolvablePropertiesEx - prod->add( YCPString("name"), YCPString( product->name() ) ); - prod->add( YCPString("version"), YCPString( product->edition().version() ) ); - prod->add(YCPString("category"), YCPString(product->category())); - prod->add(YCPString("vendor"), YCPString(product->vendor())); - prod->add(YCPString("relnotes_url"), YCPString(product->releaseNotesUrl().asString())); - std::string product_summary = product->summary(); - if (product_summary.size() > 0) - { - prod->add(YCPString("display_name"), YCPString(product_summary)); - } - std::string product_shortname = product->shortName(); - if (product_shortname.size() > 0) - { - prod->add(YCPString("short_name"), YCPString(product_shortname)); - } - // use summary for the short name if it's defined - else if (product_summary.size() > 0) - { - prod->add(YCPString("short_name"), YCPString(product_summary)); - } - prod->add(YCPString("description"), YCPString((*it)->description())); - - std::string resolvable_summary = (*it)->summary(); - if (resolvable_summary.size() > 0) - { - prod->add(YCPString("summary"), YCPString((*it)->summary())); - } - YCPList updateUrls; - std::listzypp::Url pupdateUrls = product->updateUrls(); - for (std::listzypp::Url::const_iterator it = pupdateUrls.begin(); it != pupdateUrls.end(); ++it) - { - updateUrls->add(YCPString(it->asString())); - } - prod->add(YCPString("update_urls"), updateUrls); - - YCPList flags; - std::liststd::string pflags = product->flags(); - for (std::liststd::string::const_iterator flag_it = pflags.begin(); - flag_it != pflags.end(); ++flag_it) - { - flags->add(YCPString(*flag_it)); - } - prod->add(YCPString("flags"), flags); - - products->add(prod); + if ( isKindzypp::Product( it->resolvable() ) && it->status().isInstalled() ) + { + zypp::Product::constPtr product = asKindzypp::Product( it->resolvable() ); + + #warning TargetProducts does not return all keys + YCPMap prod; + // see also PkgFunctions::Descr2Map and Product.ycp::Product + // FIXME unify with code in Pkg::ResolvablePropertiesEx + prod->add( YCPString("name"), YCPString( product->name() ) ); + prod->add( YCPString("version"), YCPString( product->edition().version() ) ); + #warning "Product::category is deprecated, remove from map and ycp code" + prod->add(YCPString("type"), YCPString(product->type())); + prod->add(YCPString("category"), YCPString(product->type())); + prod->add(YCPString("vendor"), YCPString(product->vendor())); + prod->add(YCPString("relnotes_url"), YCPString(product->releaseNotesUrl().asString())); + std::string product_summary = product->summary(); + if (product_summary.size() > 0) + { + prod->add(YCPString("display_name"), YCPString(product_summary)); + } + std::string product_shortname = product->shortName(); + if (product_shortname.size() > 0) + { + prod->add(YCPString("short_name"), YCPString(product_shortname)); + } + // use summary for the short name if it's defined + else if (product_summary.size() > 0) + { + prod->add(YCPString("short_name"), YCPString(product_summary)); + } + prod->add(YCPString("description"), YCPString((*it)->description())); + + std::string resolvable_summary = (*it)->summary(); + if (resolvable_summary.size() > 0) + { + prod->add(YCPString("summary"), YCPString((*it)->summary())); + } + YCPList updateUrls; + std::listzypp::Url pupdateUrls = product->updateUrls(); + for (std::listzypp::Url::const_iterator it = pupdateUrls.begin(); it != pupdateUrls.end(); ++it) + { + updateUrls->add(YCPString(it->asString())); + } + prod->add(YCPString("update_urls"), updateUrls); + + YCPList flags; + std::liststd::string pflags = product->flags(); + for (std::liststd::string::const_iterator flag_it = pflags.begin(); + flag_it != pflags.end(); ++flag_it) + { + flags->add(YCPString(*flag_it)); + } + prod->add(YCPString("flags"), flags); + + products->add(prod); + } } } catch(...) @@ -280,7 +285,7 @@ { try { - return YCPBoolean (zypp_ptr()->target()->whoOwnsFile(filepath->value())); + return YCPBoolean (!zypp_ptr()->target()->whoOwnsFile(filepath->value()).empty()); } catch (...) { @@ -304,70 +309,5 @@ YCPBoolean PkgFunctions::TargetStoreRemove(const YCPString& root, const YCPSymbol& kind_r) { - zypp::Resolvable::Kind kind; - std::string req_kind = kind_r->symbol(); - - if( req_kind == "product" ) { - kind = zypp::ResTraitszypp::Product::kind; - } - else if ( req_kind == "patch" ) { - kind = zypp::ResTraitszypp::Patch::kind; - } - else if ( req_kind == "package" ) { - kind = zypp::ResTraitszypp::Package::kind; - } - else if ( req_kind == "selection" ) { - kind = zypp::ResTraitszypp::Selection::kind; - } - else if ( req_kind == "pattern" ) { - kind = zypp::ResTraitszypp::Pattern::kind; - } - else if ( req_kind == "language" ) { - kind = zypp::ResTraitszypp::Language::kind; - } - else - { - y2error("Pkg::TargetStoreRemove: unknown symbol: %s", req_kind.c_str()); - return YCPBoolean(false); - } - - bool success = true; - - std::string target_root = root->value(); - if (target_root.empty()) - { - y2error("Pkg::TargetStoreRemove: parameter root is empty"); - return YCPBoolean(false); - } - - try - { - // create a storage - zypp::storage::PersistentStorage store; - store.init( target_root ); - - // get all resolvables of the required kind - std::listResObject::Ptr objects = store.storedObjects(kind); - - y2warning("Removing %zd objects of kind '%s' from %s", objects.size(), req_kind.c_str(), target_root.c_str()); - - // remove the resolvables - for( std::listResObject::Ptr::const_iterator it = objects.begin(); it != objects.end(); ++it) - { - try { - store.deleteObject(*it); - } catch( const zypp::Exception& excpt ) - { - y2error("TargetStoreRemove has failed: %s", excpt.msg().c_str()); - success = false; - } - } - } - catch( const zypp::Exception& excpt ) - { - y2error("TargetStoreRemove has failed: %s", excpt.msg().c_str()); - success = false; - } - - return YCPBoolean(success); + return YCPBoolean(true); } Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?rev=44491&r1=44490&r2=44491&view=diff ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Fri Feb 15 11:46:16 2008 @@ -71,7 +71,7 @@ { zypp_ptr()->initializeTarget(r); pkgprogress.NextStage(); - zypp_ptr()->addResolvables( zypp_ptr()->target()->resolvables(), true ); + zypp_ptr()->target()->load(); _target_loaded = true; } catch (zypp::Exception & excpt) @@ -140,7 +140,7 @@ try { - zypp_ptr()->addResolvables( zypp_ptr()->target()->resolvables(), true ); + zypp_ptr()->target()->load(); _target_loaded = true; } catch (zypp::Exception & excpt) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org