Author: lslezak
Date: Fri Aug 15 10:25:14 2008
New Revision: 50099
URL: http://svn.opensuse.org/viewcvs/yast?rev=50099&view=rev
Log:
- use Selectables, the first step...
Modified:
branches/tmp/lslezak/pkg-bindings/src/Package.cc
branches/tmp/lslezak/pkg-bindings/src/Patch.cc
branches/tmp/lslezak/pkg-bindings/src/PkgFunctions.h
branches/tmp/lslezak/pkg-bindings/src/Resolvable_Properties.cc
Modified: branches/tmp/lslezak/pkg-bindings/src/Package.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/pkg-bindings/src/Package.cc?rev=50099&r1=50098&r2=50099&view=diff
==============================================================================
--- branches/tmp/lslezak/pkg-bindings/src/Package.cc (original)
+++ branches/tmp/lslezak/pkg-bindings/src/Package.cc Fri Aug 15 10:25:14 2008
@@ -292,14 +292,18 @@
source_map[ repo->repoInfo().alias() ] = id;
}
- for( zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBeginzypp::Package()
- ; it != zypp_ptr()->pool().byKindEndzypp::Package()
- ; ++it )
- {
- zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable());
- if( pkg && it->status().isToBeInstalled())
+ for (zypp::ResPoolProxy::const_iterator it = zypp_ptr()->poolProxy().byKindBegin(zypp::ResKind::package);
+ it != zypp_ptr()->poolProxy().byKindEnd(zypp::ResKind::package);
+ ++it)
+ {
+ if ((*it)->fate() == zypp::ui::Selectable::TO_INSTALL)
{
+ zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>((*it)->candidateObj().resolvable());
+
+ if (!pkg)
+ continue;
+
unsigned int medium = pkg->mediaNr();
if (medium == 0)
{
@@ -533,30 +537,27 @@
if (pkgname.empty())
{
y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable");
- return YCPBoolean(false);
+ return YCPVoid();
}
-
try
{
- for (zypp::ResPool::byIdent_iterator it = zypp_ptr()->pool().byIdentBeginzypp::Package(pkgname);
- it != zypp_ptr()->pool().byIdentEndzypp::Package(pkgname);
- ++it)
- {
- zypp::Package::constPtr pkg = zypp::asKindzypp::Package( it->resolvable() );
+ zypp::ui::Selectable::Ptr selectable = zypp::ui::Selectable::get(pkgname);
- if (pkg != NULL)
- {
- if (installed == pkg->isSystem())
- {
- found = true;
- break;
- }
- }
+ // search installed or available package
+ if (installed)
+ {
+ found = selectable->hasInstalledObj();
+ }
+ else
+ {
+ found = selectable->hasCandidateObj();
}
}
catch (...)
{
+ y2error("Error in searchPackage");
+ return YCPVoid();
}
y2milestone("Package '%s' %s: %s", pkgname.c_str(), installed ? "installed" : "available", found ? "true" : "false");
@@ -776,15 +777,8 @@
@description
tag is a package name
- returns a map of tag,reason pairs if tags could not be removed.
- Usually this map should be empty (all required packages are
- removed)
-
- If a tag could not be removed (because other packages still
- require it), the tag is listed as a key and the value describes
- the reason for the failure (as an already translated string).
@param list tags
- @return list Result
+ @return map Result - returns empty map for comaptibility reasons
*/
YCPValue
PkgFunctions::DoRemove (const YCPList& tags)
@@ -796,11 +790,12 @@
{
if (tags->value(i)->isString())
{
- DoRemoveNameKind( tags->value(i)->asString()->value(), zypp::ResKind::package);
+ zypp::ui::Selectable::Ptr s = zypp::ui::Selectable::get(tags->value(i)->asString()->value());
+ s->setToDelete();
}
else
{
- y2error ("Pkg::DoRemove not string '%s'", tags->value(i)->toString().c_str());
+ y2error ("Pkg::DoRemove not string at position %d: '%s'", i, tags->value(i)->toString().c_str());
}
}
}
@@ -820,41 +815,21 @@
}
};
-static zypp::Package::constPtr
-find_package( const string & name, zypp::PoolItem & item, const zypp::ResPool &pool )
+static zypp::Package::constPtr find_package(const string &name)
{
if (name.empty())
return NULL;
- ItemMatch match;
-
- // look for uninstalled packages first, because they probably have
- // translated summary
-
- invokeOnEach( pool.byIdentBeginzypp::Package( name ),
- pool.byIdentEndzypp::Package( name ),
- zypp::resfilter::ByUninstalled(),
- zypp::functor::functorRef( match ) );
+ zypp::ui::Selectable::Ptr s = zypp::ui::Selectable::get(name);
- // if no match yet, try again with installed package
- // (but those only provide an english summary)
-
- if (!match.item) {
- invokeOnEach( pool.byIdentBeginzypp::Package(name),
- pool.byIdentEndzypp::Package(name),
- zypp::resfilter::ByInstalled(),
- zypp::functor::functorRef( match ) );
+ if (s)
+ {
+ return zypp::dynamic_pointer_cast<const zypp::Package>(s->theObj().resolvable());
}
- if (!match.item)
- return NULL;
-
- item = match.item;
-
- return zypp::asKindzypp::Package( match.item.resolvable() );
+ return NULL;
}
-
/**
@builtin PkgSummary
@@ -864,22 +839,20 @@
@usage Pkg::PkgSummary (string package) -> "This is a nice package"
*/
-#warning This is bogus, as we have multiple matching packages
YCPValue
PkgFunctions::PkgSummary (const YCPString& p)
{
try
{
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(p->value());
if (pkg == NULL)
{
return YCPVoid();
}
- return YCPString( pkg->summary() );
+ return YCPString(pkg->summary());
}
catch (...)
{
@@ -899,15 +872,12 @@
*/
-#warning This is bogus, as we have multiple matching packages
-
YCPValue
PkgFunctions::PkgVersion (const YCPString& p)
{
try
{
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(p->value());
if (pkg == NULL)
{
@@ -933,15 +903,13 @@
@usage Pkg::PkgSize (string package) -> 12345678
*/
-#warning This is bogus, as we have multiple matching packages
YCPValue
PkgFunctions::PkgSize (const YCPString& p)
{
try
{
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(p->value());
if (pkg == NULL)
{
@@ -967,15 +935,13 @@
@usage Pkg::PkgGroup (string package) -> string
*/
-#warning This is bogus, as we have multiple matching packages
YCPValue
PkgFunctions::PkgGroup (const YCPString& p)
{
try
{
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(p->value());
if (pkg == NULL)
{
@@ -993,13 +959,12 @@
YCPValue
-PkgFunctions::PkgProp( zypp::PoolItem item )
+PkgFunctions::PkgProp(zypp::Package::constPtr pkg)
{
YCPMap data;
- zypp::Package::constPtr pkg = zypp::asKindzypp::Package( item.resolvable() );
if (pkg == NULL) {
- y2error( "Not a package: %s", item->name().c_str() );
- return data;
+ y2error("NULL pkg");
+ return YCPVoid();
}
data->add( YCPString("arch"), YCPString( pkg->arch().asString() ) );
@@ -1010,6 +975,9 @@
data->add( YCPString("srcid"), YCPInteger( sid ) );
std::string status("available");
+
+#warning FIXME!
+/*
if (item.status().isInstalled())
{
status = "installed";
@@ -1022,6 +990,7 @@
{
status = "removed";
}
+*/
data->add( YCPString("status"), YCPSymbol(status));
data->add( YCPString("location"), YCPString( pkg->location().filename().basename() ) );
@@ -1050,19 +1019,15 @@
* @usage Pkg::PkgProperties (string package) -> map
*/
-#warning This is bogus, as we have multiple matching packages
-
YCPValue
PkgFunctions::PkgProperties (const YCPString& p)
{
try
{
- YCPMap data;
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(p->value());
- if (item)
- return PkgProp( item );
+ if (pkg)
+ return PkgProp(pkg);
}
catch (...)
{
@@ -1081,11 +1046,13 @@
{
try
{
+ /* FIXME
for (zypp::ResPool::byIdent_iterator it = zypp_ptr()->pool().byIdentBeginzypp::Package(pkgname);
it != zypp_ptr()->pool().byIdentEndzypp::Package(pkgname); ++it)
{
data->add( PkgProp( *it ) );
}
+ */
}
catch (...)
{
@@ -1099,15 +1066,11 @@
YCPValue
PkgFunctions::GetPkgLocation (const YCPString& p, bool full_path)
{
- zypp::PoolItem item;
-
try
{
- zypp::Package::constPtr pkg = find_package( p->value(), item, zypp_ptr()->pool() );
-
- YCPMap data;
+ zypp::Package::constPtr pkg = find_package(p->value());
- if (item) {
+ if (pkg) {
return (full_path) ? YCPString( pkg->location().filename().asString() )
: YCPString( pkg->location().filename().basename() );
}
@@ -1345,7 +1308,7 @@
/**
@builtin PkgAnyToDelete
- @short Check if there are any package to be deleted
+ @short Check if there are any package to be deleted - obsoleted
@description
return true if any packages are to be deleted
@return boolean
@@ -1354,35 +1317,15 @@
YCPValue
PkgFunctions::PkgAnyToDelete ()
{
- bool ret = false;
-
y2warning("Pkg::PkgAnyToDelete() is obsoleted, use Pkg::IsAnyResolvable(`package, `to_remove) instead");
-
- try
- {
- 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())
- {
- ret = true;
- break;
- }
- }
- }
- catch (...)
- {
- }
-
- return YCPBoolean(ret);
+ return IsAnyResolvable(YCPSymbol("package"), YCPSymbol("to_remove"));
}
// ------------------------
/**
@builtin AnyToInstall
- @short Check if there are any package to be installed
+ @short Check if there are any package to be installed - obsoleted
@description
return true if any packages are to be installed
@return boolean
@@ -1391,28 +1334,8 @@
YCPValue
PkgFunctions::PkgAnyToInstall ()
{
- bool ret = false;
-
y2warning("Pkg::PkgAnyToInstall() is obsoleted, use Pkg::IsAnyResolvable(`package, `to_install) instead");
-
- try
- {
- 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())
- {
- ret = true;
- break;
- }
- }
- }
- catch (...)
- {
- }
-
- return YCPBoolean(ret);
+ return IsAnyResolvable(YCPSymbol("package"), YCPSymbol("to_install"));
}
// ------------------------
@@ -2018,7 +1941,7 @@
/**
@builtin PkgEstablish
- @short establish the pool state
+ @short establish the pool state - obsoleted, not needed
@return boolean
Returns true. (If no pool item 'transacts')
@@ -2031,13 +1954,14 @@
YCPBoolean
PkgFunctions::PkgEstablish ()
{
+ y2warning("Pkg::PkgEstablish() is obsoleted, it is not needed anymore");
return YCPBoolean(false);
}
/**
@builtin PkgFreshen
- @short check all package freshens and schedule matching ones for installation
+ @short check all package freshens and schedule matching ones for installation - obsoleted, not needed
@return boolean
Returns true. (If no pool item 'transacts')
@@ -2051,6 +1975,7 @@
YCPBoolean
PkgFunctions::PkgFreshen()
{
+ y2warning("Pkg::PkgFreshen() is obsoleted, it is not needed anymore");
return YCPBoolean(true);
}
@@ -2423,8 +2348,7 @@
// get partitioning
zypp::DiskUsageCounter::MountPointSet mps = zypp_ptr()->getPartitions();
- zypp::PoolItem item;
- zypp::Package::constPtr pkg = find_package(package->value(), item, zypp_ptr()->pool() );
+ zypp::Package::constPtr pkg = find_package(package->value());
// the package was not found
if (pkg == NULL)
Modified: branches/tmp/lslezak/pkg-bindings/src/Patch.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/pkg-bindings/src/Patch.cc?rev=50099&r1=50098&r2=50099&view=diff
==============================================================================
--- branches/tmp/lslezak/pkg-bindings/src/Patch.cc (original)
+++ branches/tmp/lslezak/pkg-bindings/src/Patch.cc Fri Aug 15 10:25:14 2008
@@ -26,6 +26,8 @@
#include
+#include "log.h"
+
//-------------------------------------------------------------
/**
@builtin YouStatus
@@ -35,6 +37,7 @@
YCPValue
PkgFunctions::YouStatus ()
{
+ y2warning("Pkg::YouStatus is obsoleted, do not use");
return YCPVoid();
}
@@ -46,6 +49,7 @@
YCPValue
PkgFunctions::YouSetServer (const YCPMap& servers)
{
+ y2warning("Pkg::YouSetServer is obsoleted, do not use");
return YCPVoid();
}
@@ -58,6 +62,7 @@
YCPValue
PkgFunctions::YouGetUserPassword ()
{
+ y2warning("Pkg::YouGetUserPassword is obsoleted, do not use");
return YCPVoid();
}
@@ -69,6 +74,7 @@
YCPValue
PkgFunctions::YouSetUserPassword (const YCPString& user, const YCPString& passwd, const YCPBoolean& p)
{
+ y2warning("Pkg::YouSetUserPassword is obsoleted, do not use");
return YCPVoid();
}
@@ -81,6 +87,7 @@
YCPValue
PkgFunctions::YouGetServers (const YCPList&)
{
+ y2warning("Pkg::YouGetServers is obsoleted, do not use");
return YCPVoid();
}
@@ -95,6 +102,7 @@
YCPValue
PkgFunctions::YouGetDirectory ()
{
+ y2warning("Pkg::YouGetDirectory is obsoleted, do not use");
return YCPVoid();
}
@@ -106,6 +114,7 @@
YCPValue
PkgFunctions::YouRetrievePatchInfo (const YCPBoolean& download, const YCPBoolean& sig)
{
+ y2warning("Pkg::YouRetrievePatchInfo is obsoleted, do not use");
return YCPVoid();
}
@@ -117,6 +126,7 @@
YCPValue
PkgFunctions::YouProcessPatches ()
{
+ y2warning("Pkg::YouProcessPatches is obsoleted, do not use");
return YCPVoid();
}
@@ -128,6 +138,7 @@
YCPValue
PkgFunctions::YouSelectPatches ()
{
+ y2warning("Pkg::YouSelectPatches is obsoleted, do not use");
return YCPVoid();
}
@@ -139,5 +150,6 @@
YCPValue
PkgFunctions::YouRemovePackages ()
{
+ y2warning("Pkg::YouRemovePackages is obsoleted, do not use");
return YCPVoid();
}
Modified: branches/tmp/lslezak/pkg-bindings/src/PkgFunctions.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/pkg-bindings/src/PkgFunctions.h?rev=50099&r1=50098&r2=50099&view=diff
==============================================================================
--- branches/tmp/lslezak/pkg-bindings/src/PkgFunctions.h (original)
+++ branches/tmp/lslezak/pkg-bindings/src/PkgFunctions.h Fri Aug 15 10:25:14 2008
@@ -42,6 +42,7 @@
class YCPReference;
#include
+#include
#include
#include
@@ -124,7 +125,7 @@
std::string UniqueAlias(const std::string &alias);
YCPValue GetPkgLocation(const YCPString& p, bool full_path);
- YCPValue PkgProp( zypp::PoolItem item );
+ YCPValue PkgProp(zypp::Package::constPtr pkg);
YCPValue PkgMediaSizesOrCount (bool sizes, bool download_size = false);
YCPValue TargetInitInternal(const YCPString& root, bool rebuild_rpmdb);
Modified: branches/tmp/lslezak/pkg-bindings/src/Resolvable_Properties.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/pkg-bindings/src/Resolvable_Properties.cc?rev=50099&r1=50098&r2=50099&view=diff
==============================================================================
--- branches/tmp/lslezak/pkg-bindings/src/Resolvable_Properties.cc (original)
+++ branches/tmp/lslezak/pkg-bindings/src/Resolvable_Properties.cc Fri Aug 15 10:25:14 2008
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
@@ -155,78 +156,79 @@
try
{
- for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(kind);
- it != zypp_ptr()->pool().byKindEnd(kind);
+ for (zypp::ResPoolProxy::const_iterator it = zypp_ptr()->poolProxy().byKindBegin(kind);
+ it != zypp_ptr()->poolProxy().byKindEnd(kind);
++it)
{
- if ((nm.empty() || nm == (*it)->name())
- && (vers.empty() || vers == (*it)->edition().asString()))
+ if ((nm.empty() || nm == (*it)->theObj()->name())
+ && (vers.empty() || vers == (*it)->theObj()->edition().asString()))
{
YCPMap info;
- info->add(YCPString("name"), YCPString((*it)->name()));
- info->add(YCPString("version"), YCPString((*it)->edition().asString()));
- info->add(YCPString("arch"), YCPString((*it)->arch().asString()));
- info->add(YCPString("description"), YCPString((*it)->description()));
+ info->add(YCPString("name"), YCPString((*it)->theObj()->name()));
+ info->add(YCPString("version"), YCPString((*it)->theObj()->edition().asString()));
+ info->add(YCPString("arch"), YCPString((*it)->theObj()->arch().asString()));
+ info->add(YCPString("description"), YCPString((*it)->theObj()->description()));
- std::string resolvable_summary = (*it)->summary();
+ std::string resolvable_summary = (*it)->theObj()->summary();
if (resolvable_summary.size() > 0)
{
- info->add(YCPString("summary"), YCPString((*it)->summary()));
+ info->add(YCPString("summary"), YCPString(resolvable_summary));
}
// status
std::string stat;
- if (it->status().isInstalled() || it->status().isSatisfied())
+ // selectable status
+ zypp::ui::Status status = (*it)->status();
+
+ switch((*it)->fate())
{
- if (it->status().isToBeUninstalled())
- {
+ case zypp::ui::Selectable::TO_INSTALL:
+ stat = "selected";
+ // add the transaction data
+ info->add(YCPString("transact_by"), YCPSymbol(TransactToString((*it)->theObj().status().getTransactByValue())));
+ break;
+ case zypp::ui::Selectable::TO_DELETE:
stat = "removed";
- info->add(YCPString("transact_by"), YCPSymbol(TransactToString(it->status().getTransactByValue())));
- }
- else
- {
- stat = "installed";
- }
+ // add the transaction data
+ info->add(YCPString("transact_by"), YCPSymbol(TransactToString((*it)->theObj().status().getTransactByValue())));
+ break;
+ case zypp::ui::Selectable::UNMODIFIED:
+ stat = (status == zypp::ui::S_KeepInstalled
+ || status == zypp::ui::S_Protected) ? "installed" : "available";
+ break;
}
- else if (it->status().isToBeInstalled())
- {
- stat = "selected";
- info->add(YCPString("transact_by"), YCPSymbol(TransactToString(it->status().getTransactByValue())));
- }
- else
- {
- stat = "available";
- }
-
+
info->add(YCPString("status"), YCPSymbol(stat));
+ info->add(YCPString("status_detail"), YCPSymbol(zypp::ui::asString(status)));
// is the resolvable locked? (Locked or Taboo in the UI)
- info->add(YCPString("locked"), YCPBoolean(it->status().isLocked()));
+ info->add(YCPString("locked"), YCPBoolean(status == zypp::ui::S_Protected
+ || status == zypp::ui::S_Taboo));
// source
- info->add(YCPString("source"), YCPInteger(logFindAlias((*it)->repoInfo().alias())));
+ info->add(YCPString("source"), YCPInteger(logFindAlias((*it)->theObj()->repoInfo().alias())));
// add license info if it is defined
- std::string license = (*it)->licenseToConfirm();
+ std::string license = (*it)->theObj()->licenseToConfirm();
if (!license.empty())
{
- info->add(YCPString("license_confirmed"), YCPBoolean(it->status().isLicenceConfirmed()));
+ info->add(YCPString("license_confirmed"), YCPBoolean((*it)->theObj().status().isLicenceConfirmed()));
info->add(YCPString("license"), YCPString(license));
}
- info->add(YCPString("download_size"), YCPInteger((*it)->downloadSize()));
- info->add(YCPString("inst_size"), YCPInteger((*it)->installSize()));
+ info->add(YCPString("download_size"), YCPInteger((*it)->theObj()->downloadSize()));
+ info->add(YCPString("inst_size"), YCPInteger((*it)->theObj()->installSize()));
- info->add(YCPString("medium_nr"), YCPInteger((*it)->mediaNr()));
- info->add(YCPString("vendor"), YCPString((*it)->vendor()));
+ info->add(YCPString("medium_nr"), YCPInteger((*it)->theObj()->mediaNr()));
+ info->add(YCPString("vendor"), YCPString((*it)->theObj()->vendor()));
// package specific info
if( req_kind == "package" )
{
- zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable());
+ zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>((*it)->theObj().resolvable());
if ( pkg )
{
std::string tmp = pkg->location().filename().asString();
@@ -247,7 +249,7 @@
}
// product specific info
else if( req_kind == "product" ) {
- zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(it->resolvable());
+ zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>((*it)->theObj().resolvable());
if ( !product )
{
y2error("product %s is not a product", (*it)->name().c_str() );
@@ -318,7 +320,7 @@
}
// pattern specific info
else if ( req_kind == "pattern" ) {
- zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>(it->resolvable());
+ zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>((*it)->theObj().resolvable());
info->add(YCPString("category"), YCPString(pattern->category()));
info->add(YCPString("user_visible"), YCPBoolean(pattern->userVisible()));
info->add(YCPString("default"), YCPBoolean(pattern->isDefault()));
@@ -329,12 +331,12 @@
// patch specific info
else if ( req_kind == "patch" )
{
- zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(it->resolvable());
+ zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>((*it)->theObj().resolvable());
info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive()));
info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->rebootSuggested()));
info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->restartSuggested()));
- info->add(YCPString("is_needed"), YCPBoolean(it->isBroken()));
+ info->add(YCPString("is_needed"), YCPBoolean((*it)->theObj().isBroken()));
}
// dependency info
@@ -356,7 +358,7 @@
{
try {
zypp::Dep depkind(*kind_it);
- zypp::Capabilities deps = it->resolvable()->dep(depkind);
+ zypp::Capabilities deps = (*it)->theObj().resolvable()->dep(depkind);
zypp::sat::WhatProvides prv(deps);
@@ -447,15 +449,17 @@
try
{
- for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(kind);
- it != zypp_ptr()->pool().byKindEnd(kind);
+ for (zypp::ResPoolProxy::const_iterator it = zypp_ptr()->poolProxy().byKindBegin(kind);
+ it != zypp_ptr()->poolProxy().byKindEnd(kind);
++it)
{
- if (stat_str == "to_install" && it->status().isToBeInstalled())
+ zypp::ui::Selectable::Fate fate = (*it)->fate();
+
+ if (stat_str == "to_install" && fate == zypp::ui::Selectable::TO_INSTALL)
{
return YCPBoolean(true);
}
- else if (stat_str == "to_remove" && it->status().isToBeUninstalled())
+ else if (stat_str == "to_remove" && fate == zypp::ui::Selectable::TO_DELETE)
{
return YCPBoolean(true);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org