Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10564 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Mon, 14 Jul 2008 09:26:06 -0000
  • Message-id: <20080714092606.406B630258@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Mon Jul 14 11:26:05 2008
New Revision: 10564

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10564&view=rev
Log:
- corrected logging onf solver settings
- regard locking while doUpdate (bnc 405427)

Modified:
trunk/libzypp/zypp/solver/detail/SATResolver.cc

Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATResolver.cc?rev=10564&r1=10563&r2=10564&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Mon Jul 14 11:26:05 2008
@@ -106,18 +106,22 @@
std::ostream &
SATResolver::dumpOn( std::ostream & os ) const
{
- os << "<resolver>";
- os << " fixsystem = " << _fixsystem << endl;
- os << " allowdowngrade = " << _allowdowngrade << endl;
- os << " allowarchchange = " << _allowarchchange << endl;
- os << " allowvendorchange = " << _allowvendorchange << endl;
- os << " allowuninstall = " << _allowuninstall << endl;
- os << " updatesystem = " << _updatesystem << endl;
- os << " allowvirtualconflicts = " << _allowvirtualconflicts << endl;
- os << " noupdateprovide = " << _noupdateprovide << endl;
- os << " dosplitprovides = " << _dosplitprovides << endl;
- os << " onlyRequires = " << _onlyRequires << endl;
- os << " ignorealreadyrecommended = " << _ignorealreadyrecommended << endl;
+ os << "<resolver>" << endl;
+ if (_solv) {
+ os << " fixsystem = " << _solv->fixsystem << endl;
+ os << " allowdowngrade = " << _solv->allowdowngrade << endl;
+ os << " allowarchchange = " << _solv->allowarchchange << endl;
+ os << " allowvendorchange = " << _solv->allowvendorchange << endl;
+ os << " allowuninstall = " << _solv->allowuninstall << endl;
+ os << " updatesystem = " << _solv->updatesystem << endl;
+ os << " allowvirtualconflicts = " << _solv->allowvirtualconflicts <<
endl;
+ os << " noupdateprovide = " << _solv->noupdateprovide << endl;
+ os << " dosplitprovides = " << _solv->dosplitprovides << endl;
+ os << " onlyRequires = " << _solv->dontinstallrecommended << endl;
+ os << " ignorealreadyrecommended = " <<
_solv->ignorealreadyrecommended << endl;
+ } else {
+ os << "<NULL>";
+ }
return os << "<resolver/>" << endl;
}

@@ -812,6 +816,32 @@
PoolItemSet(),
ObsoleteStrings());

+ for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter !=
_items_to_lock.end(); iter++) {
+ sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() );
+ if (iter->status().isInstalled()) {
+ MIL << "Lock installed item " << *iter << endl;
+ queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE );
+ queue_push( &(_jobQueue), ident );
+ } else {
+ MIL << "Lock NOT installed item " << *iter << endl;
+ queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE );
+ queue_push( &(_jobQueue), ident );
+ }
+ }
+
+ for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter !=
_items_to_keep.end(); iter++) {
+ sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() );
+ if (iter->status().isInstalled()) {
+ MIL << "Keep installed item " << *iter << endl;
+ queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK);
+ queue_push( &(_jobQueue), ident );
+ } else {
+ MIL << "Keep NOT installed item " << *iter << ident << endl;
+ queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK);
+ queue_push( &(_jobQueue), ident );
+ }
+ }
+
_solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get()
);
_solv->vendorCheckCb = &vendorCheck;


--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages