Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10563 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Mon, 14 Jul 2008 09:13:01 -0000
  • Message-id: <20080714091302.1D4D130228@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Mon Jul 14 11:13:01 2008
New Revision: 10563

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10563&view=rev
Log:
bugfix in doUpdate

Modified:
trunk/libzypp-testsuite/solver/src/deptestomatic.cc

Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=10563&r1=10562&r2=10563&view=diff
==============================================================================
--- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original)
+++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Mon Jul 14 11:13:01 2008
@@ -816,6 +816,7 @@
static bool first_trial = true;

bool verify = false;
+ bool doUpdate = false;
bool instorder = false;
bool mediaorder = false;

@@ -941,6 +942,7 @@
RESULT << "Doing update ..." << endl;
resolver->doUpdate();
print_solution (pool, instorder, mediaorder);
+ doUpdate = true;

} else if (node->equals ("instorder")) {

@@ -1335,19 +1337,21 @@
}

bool success = false;
-
- if (verify) {
- success = resolver->verifySystem ();
- } else {
- if (!solverQueue.empty())
- success = resolver->resolveQueue(solverQueue);
- else
- success = resolver->resolvePool();
- }
- if (success) {
- print_solution (pool, instorder, mediaorder);
- } else {
- RESULT << "No valid solution found." << endl;
+
+ if (!doUpdate) {
+ if (verify) {
+ success = resolver->verifySystem ();
+ } else {
+ if (!solverQueue.empty())
+ success = resolver->resolveQueue(solverQueue);
+ else
+ success = resolver->resolvePool();
+ }
+ if (success) {
+ print_solution (pool, instorder, mediaorder);
+ } else {
+ RESULT << "No valid solution found." << 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