From 0b689bcdf0d84477369f353e12293c5968f82c36 Mon Sep 17 00:00:00 2001 From: Klaus Kaempf Date: Fri, 3 Feb 2006 13:24:30 +0000 Subject: [PATCH] update --- .../yast-tests/exercise-02conflict-06-test.solution | 3 --- .../yast-tests/exercise-alternatives-1-test.solution | 4 ++-- .../yast-tests/exercise-alternatives-3-test.solution | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution index 5e5331a..e799331 100644 --- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution +++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-02conflict-06-test.solution @@ -5,6 +5,3 @@ >!> remove test2-1.0-1 >!> |unflag test4-1.0-1[test] >!> installs=1, upgrades=0, uninstalls=2 ->!> Solution #2: ->!> This solution is a duplicate. ->!> installs=1, upgrades=0, uninstalls=2 diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution index 1cee55c..7a7c927 100644 --- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution +++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-1-test.solution @@ -5,8 +5,8 @@ >!> install postfix-1.0-1[test] >!> installs=3, upgrades=0, uninstalls=0 >!> Solution #2: ->!> install WindowMaker-1.0-1[test] >!> install alt-1.0-1[test] +>!> install icewm-1.0-1[test] >!> install sendmail-1.0-1[test] >!> installs=3, upgrades=0, uninstalls=0 >!> Solution #3: @@ -15,7 +15,7 @@ >!> install postfix-1.0-1[test] >!> installs=3, upgrades=0, uninstalls=0 >!> Solution #4: +>!> install WindowMaker-1.0-1[test] >!> install alt-1.0-1[test] ->!> install icewm-1.0-1[test] >!> install sendmail-1.0-1[test] >!> installs=3, upgrades=0, uninstalls=0 diff --git a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution index 5272d63..08ecc23 100644 --- a/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution +++ b/testsuite/solver/data.deptestomatic/yast-tests/exercise-alternatives-3-test.solution @@ -8,7 +8,7 @@ >!> Solution #2: >!> install alt-conflict-1.0-1[test] >!> install icewm-1.0-1[test] ->!> install postfix-1.0-1[test] +>!> install sendmail-1.0-1[test] >!> remove foo-1.0-1 >!> installs=3, upgrades=0, uninstalls=1 >!> Solution #3: @@ -20,6 +20,6 @@ >!> Solution #4: >!> install alt-conflict-1.0-1[test] >!> install icewm-1.0-1[test] ->!> install sendmail-1.0-1[test] +>!> install postfix-1.0-1[test] >!> remove foo-1.0-1 >!> installs=3, upgrades=0, uninstalls=1 -- 2.7.4