Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11603 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Thu, 06 Nov 2008 17:07:08 -0000
  • Message-id: <20081106170708.C556033914@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Thu Nov 6 18:07:08 2008
New Revision: 11603

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11603&view=rev
Log:
reverting changes

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=11603&r1=11602&r2=11603&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Thu Nov 6 18:07:08 2008
@@ -1321,13 +1321,13 @@
CapabilitySet system_conflicts =
SystemCheck::instance().conflictSystemCap();

for (CapabilitySet::const_iterator iter = system_requires.begin(); iter !=
system_requires.end(); iter++) {
- queue_push( &(_jobQueue),
SOLVER_INSTALL_SOLVABLE_PROVIDES|SOLVER_ESSENTIAL );
+ queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE_PROVIDES);
queue_push( &(_jobQueue), iter->id() );
MIL << "SYSTEM Requires " << *iter << endl;
}

for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter
!= system_conflicts.end(); iter++) {
- queue_push( &(_jobQueue),
SOLVER_ERASE_SOLVABLE_PROVIDES|SOLVER_ESSENTIAL);
+ queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_PROVIDES);
queue_push( &(_jobQueue), iter->id() );
MIL << "SYSTEM Conflicts " << *iter << endl;
}

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

< Previous Next >
This Thread
  • No further messages