Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7588 - in /trunk/sat-solver: src/solver.c testsuite/README.FAILS
  • From: coolo@xxxxxxxxxxxxxxxx
  • Date: Sun, 21 Oct 2007 07:35:24 -0000
  • Message-id: <20071021073524.3D3E023A46@xxxxxxxxxxxxxxxx>
Author: coolo
Date: Sun Oct 21 09:35:23 2007
New Revision: 7588

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7588&view=rev
Log:
fixed mean bug in an optimization of addrule:

Differ between binary rules and non-binary rules
with one literal (e.g. two kernels)
(fixed 5 test cases)

Modified:
    trunk/sat-solver/src/solver.c
    trunk/sat-solver/testsuite/README.FAILS

Modified: trunk/sat-solver/src/solver.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7588&r1=7587&r2=7588&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Sun Oct 21 09:35:23 2007
@@ -623,10 +623,13 @@
       n = 1;                          /* re-set n, was used as temp var */
     }
 
+  /* check if the last added rule is exactly the same as what we're looking for.
+   * Differ between binary rules and non-binary rules with one literal (e.g. two kernels) */
   if (r
       && n == 1
       && r->p == p
-      && r->w2 == d)
+      && ( ( !r->d && r->w2 == d )
+          || r->d == d))
   {
     return r;
   }

Modified: trunk/sat-solver/testsuite/README.FAILS
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/README.FAILS?rev=7588&r1=7587&r2=7588&view=diff
==============================================================================
--- trunk/sat-solver/testsuite/README.FAILS (original)
+++ trunk/sat-solver/testsuite/README.FAILS Sun Oct 21 09:35:23 2007
@@ -39,10 +39,6 @@
 ./data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml
        the packages from the selections are ignored
        
-./data.libzypp/kernel-tests/1_2_2-smp-test.xml
-./data.libzypp/kernel-tests/1_2_2-default-test.xml
-       kernel-smp can't be upgraded without invalidating
-
 # MISSINGS
 ./data.libzypp/bugzilla-tests/bug308252-test.xml
 ./data.libzypp/bugzilla-tests/bug239199-test.xml
@@ -65,9 +61,6 @@
 ./data.libzypp/bugzilla-tests/bug238284-test.xml
        patches pretty much unimplemented - very likely not a solver problem
 
-./data.libzypp/kernel-tests/1_2_1-smp-test.xml
-./data.libzypp/kernel-tests/1_2_1-default-test.xml
-./data.libzypp/kernel-tests/1_2_1-default-manual-test.xml
 ./data.libzypp/kernel-tests/3_1-test.xml
 ./data.libzypp/kernel-tests/3_4-test.xml
 ./data.libzypp/kernel-tests/kernel_kmp-test.xml

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

< Previous Next >
This Thread
  • No further messages