Author: schubi2 Date: Mon Sep 1 12:31:44 2008 New Revision: 10903 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10903&view=rev Log: replace SOLVER_ERASE_SOLVABLE_NAME by SOLVER_ERASE_SOLVABLE Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/systemCheck-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.solution?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.solution Mon Sep 1 12:31:44 2008 @@ -13,15 +13,15 @@

!> kerry-0.2.2-91.i586 requires beagle >= 0.2.6, but this requirement cannot be provided !> !> Solution: ->!> keep beagle +>!> deinstallation of kerry-0.2.2-91.i586 !> !> Solution: ->!> deinstallation of kerry-0.2.2-91.i586 +>!> keep beagle-0.2.18-30.i586 !> !> Solution: !> Ignore some dependencies of kerry !> ->!> Taking solution: 0 +>!> Taking solution: 1 !> For problem: 0 !> 1 problems found: !> 1 problems found: @@ -29,15 +29,15 @@ !> kerry-0.2.2-91.i586 requires libbeagle.so.0, but this requirement cannot be provided !> !> Solution: ->!> keep libbeagle +>!> deinstallation of kerry-0.2.2-91.i586 !> !> Solution: ->!> deinstallation of kerry-0.2.2-91.i586 +>!> keep libbeagle-0.2.18-23.i586 !> !> Solution: !> Ignore some dependencies of kerry !> ->!> Taking solution: 0 +>!> Taking solution: 1 !> For problem: 0 !> No problems so far !> No problems so far

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.xml?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.xml (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/393969-test.xml Mon Sep 1 12:31:44 2008 @@ -59,9 +59,9 @@ <uninstall kind="package" name="libbeagle-devel" status="I_Tu_"/> <uninstall kind="package" name="libbeagle-python" status="I_Tu_"/> <reportproblems/> -<takesolution problem="0" solution="0"/> +<takesolution problem="0" solution="1"/> <reportproblems/> -<takesolution problem="0" solution="0"/> +<takesolution problem="0" solution="1"/> <reportproblems/> </trial> </test> Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution Mon Sep 1 12:31:44 2008 @@ -4,15 +4,15 @@

!> B-1.0-1.noarch requires A, but this requirement cannot be provided !> deleted providers: A-1.0-1.noarch[@System] !> Solution: ->!> keep A +>!> deinstallation of B-1.0-1.noarch !> !> Solution: ->!> deinstallation of B-1.0-1.noarch +>!> keep A-1.0-1.noarch !> !> Solution: !> Ignore some dependencies of B !> ->!> Taking solution: 1 +>!> Taking solution: 0 !> For problem: 0 !> No problems so far !> Solution :

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.xml?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.xml (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.xml Mon Sep 1 12:31:44 2008 @@ -9,6 +9,6 @@ <trial> <uninstall package="A"/> <reportproblems/> - <takesolution problem="0" solution="1"/> + <takesolution problem="0" solution="0"/> </trial> </test> Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution Mon Sep 1 12:31:44 2008 @@ -4,10 +4,10 @@

!> B-1.0-1.noarch requires A, but this requirement cannot be provided !> deleted providers: A-1.0-1.noarch[@System] !> Solution: ->!> keep A +>!> deinstallation of B-1.0-1.noarch !> !> Solution: ->!> deinstallation of B-1.0-1.noarch +>!> keep A-1.0-1.noarch !> !> Solution: !> Ignore some dependencies of B

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/systemCheck-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/systemCheck-test.solution?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/systemCheck-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/systemCheck-test.solution Mon Sep 1 12:31:44 2008 @@ -6,18 +6,18 @@

!> This request will break your system! !> conflicting requests !> Solution: ->!> keep ImageMagick-devel +>!> ignore the warning of a broken system !> !> Solution: ->!> ignore the warning of a broken system +>!> keep ImageMagick-devel-6.3.5.10-2.i586 !> !> Problem: !> This request will break your system! !> conflicting requests !> Solution: ->!> keep glibc ->!> ->!> Solution: !> Following actions will be done: !> ignore the warning of a broken system +>!> Solution: +>!> keep glibc-2.6.1-18.i686 +>!> !> No valid solution found.

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution?rev=10903&r1=10902&r2=10903&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution Mon Sep 1 12:31:44 2008 @@ -4,10 +4,10 @@

!> foo2-1.0-1.noarch requires foo, but this requirement cannot be provided !> deleted providers: foo-1.0-1.noarch[@System] !> Solution: ->!> keep foo +>!> deinstallation of foo2-1.0-1.noarch !> !> Solution: ->!> deinstallation of foo2-1.0-1.noarch +>!> keep foo-1.0-1.noarch !> !> Solution: !> Ignore some dependencies of foo2

-- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org