Author: dmacvicar
Date: Wed Feb 6 03:16:04 2008
New Revision: 8491
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8491&view=rev
Log:
use repoinfo
Modified:
branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc
branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
branches/tmp/ma/jump_sat/zypper/src/zypper-misc.h
branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc
Modified: branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc Wed Feb 6 03:16:04 2008
@@ -226,7 +226,7 @@
for ( std::list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it )
{
// load into the pool
- manager.loadFromCache(it->alias());
+ manager.loadFromCache(*it);
}
if ( repos.size() == 0 )
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc Wed Feb 6 03:16:04 2008
@@ -1185,9 +1185,9 @@
class LookForArchUpdate : public zypp::resfilter::PoolItemFilterFunctor
{
public:
- PoolItem_Ref best;
+ PoolItem best;
- bool operator()( PoolItem_Ref provider )
+ bool operator()( PoolItem provider )
{
if (!provider.status().isLocked() // is not locked (taboo)
&& (!best // first match
@@ -1207,8 +1207,8 @@
// Similar to zypp::solver::detail::Helper::findUpdateItem
// but that allows changing the arch (#222140).
static
-PoolItem_Ref
-findArchUpdateItem( const ResPool & pool, PoolItem_Ref item )
+PoolItem
+findArchUpdateItem( const ResPool & pool, PoolItem item )
{
LookForArchUpdate info;
@@ -1230,7 +1230,7 @@
// ----------------------------------------------------------------------------
-typedef set Candidates;
+typedef set<PoolItem> Candidates;
static void
find_updates( const ResObject::Kind &kind, Candidates &candidates )
@@ -1245,7 +1245,7 @@
if (it->status().isUninstalled())
continue;
// (actually similar to ProvideProcess?)
- PoolItem_Ref candidate = findArchUpdateItem( pool, *it );
+ PoolItem candidate = findArchUpdateItem( pool, *it );
if (!candidate.resolvable())
continue;
@@ -1342,8 +1342,8 @@
// multiple installed resolvables of the same name.
// LookForArchUpdate will return the one with the highest edition.
-PoolItem_Ref
-findInstalledItem( PoolItem_Ref item )
+PoolItem
+findInstalledItem( PoolItem item )
{
const zypp::ResPool& pool = God->pool();
LookForArchUpdate info;
@@ -1369,7 +1369,7 @@
bool require_item_update (const PoolItem& pi) {
Resolver_Ptr resolver = zypp::getZYpp()->resolver();
- PoolItem_Ref installed = findInstalledItem( pi );
+ PoolItem installed = findInstalledItem( pi );
// require anything greater than the installed version
try {
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-misc.h?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-misc.h (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-misc.h Wed Feb 6 03:16:04 2008
@@ -110,8 +110,8 @@
// copied from yast2-pkg-bindings:PkgModuleFunctions::DoProvideNameKind
struct ProvideProcess
{
- zypp::PoolItem_Ref item;
- zypp::PoolItem_Ref installed_item;
+ zypp::PoolItem item;
+ zypp::PoolItem installed_item;
zypp::ResStatus::TransactByValue whoWantsIt;
std::string version;
zypp::Arch _architecture;
Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc Wed Feb 6 03:16:04 2008
@@ -1273,7 +1273,7 @@
continue;
}
- manager.loadFromCache(repo.alias());
+ manager.loadFromCache(repo);
//cout_v << " " << format(_("(%d resolvables found)")) % store.size() << endl;
}
catch (const Exception & e)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
