Author: schubi2
Date: Thu Jan 24 17:20:26 2008
New Revision: 8367
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8367&view=rev
Log:
setting SAT-solver flags for update and verify
Modified:
branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc
branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h
branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc
branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.h
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc?rev=8367&r1=8366&r2=8367&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc Thu Jan 24 17:20:26 2008
@@ -436,11 +436,6 @@
_solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() );
sat::Pool::instance().setDirty();
sat::Pool::instance().prepare();
- _solv->fixsystem = false;
- _solv->updatesystem = false;
- _solv->allowdowngrade = false;
- _solv->allowuninstall = false;
- _solv->noupdateprovide = false;
// Solve !
MIL << "Starting solving...." << endl;
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h?rev=8367&r1=8366&r2=8367&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.h Thu Jan 24 17:20:26 2008
@@ -64,7 +64,6 @@
Solver *_solv;
Queue _jobQueue;
-
// list populated by calls to addPoolItemTo*()
PoolItemList _items_to_install;
PoolItemList _items_to_remove;
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc?rev=8367&r1=8366&r2=8367&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Resolver.cc Thu Jan 24 17:20:26 2008
@@ -64,10 +64,12 @@
//---------------------------------------------------------------------------
Resolver::Resolver (const ResPool & pool)
- : _pool (pool)
- , _satResolver (NULL)
- , _poolchanged( _pool.serial() )
- , _forceResolve (false)
+ : _pool(pool)
+ , _satResolver(NULL)
+ , _poolchanged(_pool.serial() )
+ , _forceResolve(false)
+ , _upgradeMode(false)
+ , _verifying(false)
{
@@ -89,7 +91,7 @@
void
Resolver::reset (bool keepExtras )
{
- _items_to_verify.clear();
+ _verifying = false;
if (!keepExtras) {
_extra_requires.clear();
@@ -97,15 +99,6 @@
}
}
-
-void
-Resolver::addPoolItemToVerify (PoolItem_Ref item)
-{
-
- _items_to_verify.push_back (item);
-}
-
-
void
Resolver::addExtraRequire (const Capability & capability)
{
@@ -201,55 +194,20 @@
};
-struct VerifySystem : public resfilter::PoolItemFilterFunctor
-{
- Resolver & resolver;
-
- VerifySystem (Resolver & r)
- : resolver (r)
- { }
-
- bool operator()( PoolItem_Ref provider )
- {
- resolver.addPoolItemToVerify (provider);
- return true;
- }
-};
-
bool
Resolver::verifySystem ()
{
UndoTransact resetting (ResStatus::APPL_HIGH);
_DEBUG ("Resolver::verifySystem() ");
+
+ _verifying = true;
invokeOnEach ( _pool.begin(), _pool.end(),
resfilter::ByTransact( ), // Resetting all transcations
functor::functorRef