Author: schubi2 Date: Fri Feb 15 14:02:17 2008 New Revision: 8718 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8718&view=rev Log: cleanup Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/obsoletes-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/uninstall-test.solution Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore Fri Feb 15 14:02:17 2008 @@ -3,3 +3,5 @@ exercise-sles10-beta3-nodelete-test.xml #disables due Bug 273918 exercise-bug150844-test.xml +#unmaintained packages does not fit due vendor checking anymore +unmaintained-single-test.xml Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution Fri Feb 15 14:02:17 2008 @@ -1,3 +1,4 @@

!> Doing distribution upgrade ... ->!> 1: I__s_[S1:0][package]A-1.0-1.noarch ->!> 2: U__s_[S2:0][package]B-2.0-1.noarch +>!> 1: I__s_[S5:1]sat::solvable(2|A-1.0-1.noarch){@System} +>!> 2: U__s_[S6:1]sat::solvable(3|B-2.0-1.noarch){upgrade} +>!> Solution :

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict-test.solution Fri Feb 15 14:02:17 2008 @@ -2,21 +2,16 @@

!> Installing B from channel test !> 1 problems found: !> Problem: ->!> Cannot install B, because it is conflicting with A ->!> A conflict over B == 1.0-1 (B) requires the removal of B-1.0-1.noarch[test] which is scheduled for installation +>!> A-1.0-1.noarch conflicts with B provided by B-1.0-1.noarch +>!> !> Solution: ->!> do not install B ->!> do not install B-1.0-1.noarch[test] ->!> Solution: ->!> do not install A ->!> do not install A-1.0-1.noarch[test] +>!> do not install B-1.0-1.noarch +>!> !> Solution: ->!> Ignore this conflict of B +>!> do not install A-1.0-1.noarch !> !> Taking solution: 0 !> For problem: 0 !> No problems so far ->!> Solution #1: +>!> Solution : !> install A-1.0-1.noarch[test] ->!> |unflag B-1.0-1.noarch[test] ->!> installs=1, upgrades=0, uninstalls=0

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict2-test.solution Fri Feb 15 14:02:17 2008 @@ -1,14 +1,12 @@

!> Installing B from channel test !> 1 problems found: !> Problem: ->!> Cannot install B, because it is conflicting with A ->!> A conflict over B == 1.0-1 (B) requires the removal of B-1.0-1.noarch[test] which is scheduled for installation +>!> A-1.0-1.noarch conflicts with B provided by B-1.0-1.noarch +>!> !> Solution: ->!> do not install B ->!> do not install B-1.0-1.noarch[test] ->!> Solution: ->!> delete A ->!> delete A-1.0-1.noarch +>!> deinstallation of A-1.0-1.noarch +>!> !> Solution: ->!> Ignore this conflict of B +>!> do not install B-1.0-1.noarch !> +>!> No valid solution found.

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/conflict4-test.solution Fri Feb 15 14:02:17 2008 @@ -1,7 +1,6 @@

!> Installing B from channel test !> Uninstalling A !> No problems so far ->!> Solution #1: +>!> Solution : !> install B-1.0-1.noarch[test] ->!> remove A-1.0-1.noarch ->!> installs=1, upgrades=0, uninstalls=1 +>!> delete A-1.0-1.noarch[@System]

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore Fri Feb 15 14:02:17 2008 @@ -2,4 +2,8 @@ conflict-postfix-sendmail-test.xml unfulfilled-3-test.xml # works correctly but can not compare solution (order) -parallel-test.xml \ No newline at end of file +parallel-test.xml +# having no ignore solution +conflict3-test.xml +remove-still-needed1-test.xml +require-test.xml \ No newline at end of file Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/obsoletes-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/obsoletes-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/obsoletes-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/obsoletes-test.solution Fri Feb 15 14:02:17 2008 @@ -2,14 +2,12 @@

!> Installing foo from channel test !> 1 problems found: !> Problem: ->!> Cannot install foo, because it is conflicting with foonew ->!> A conflict over foo == 2.0-1 (foo) requires the removal of foo-2.0-1.noarch[test] which is scheduled for installation +>!> foonew-2.0-1.noarch obsoletes foo provided by foo-2.0-1.noarch +>!> !> Solution: ->!> do not install foo ->!> do not install foo-2.0-1.noarch[test] +>!> Following actions will be done: +>!> do not install foo-2.0-1.noarch !> Solution: ->!> do not install foonew ->!> do not install foonew-2.0-1.noarch[test] ->!> Solution: ->!> Ignore this conflict of foo +>!> do not install foonew-2.0-1.noarch !> +>!> No valid solution found.

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=8718&r1=8717&r2=8718&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 Fri Feb 15 14:02:17 2008 @@ -1,17 +1,17 @@

!> Uninstalling A !> 1 problems found: !> Problem: ->!> B has missing dependencies ->!> There are no alternative providers of A installed for B-1.0-1.noarch +>!> B-1.0-1.noarch requires A, but none of the providers can be installed +>!> !> Solution: ->!> keep A ->!> keep A-1.0-1.noarch ->!> Solution: ->!> delete B ->!> delete B-1.0-1.noarch +>!> deinstallation of B-1.0-1.noarch +>!> !> Solution: ->!> Ignore this requirement just here +>!> keep A !> !> Taking solution: 0 !> For problem: 0 !> No problems so far +>!> Solution : +>!> delete A-1.0-1.noarch[@System] +>!> delete B-1.0-1.noarch[@System]

Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.xml?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.xml (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.xml Fri Feb 15 14:02:17 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/unfulfilled-2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution?rev=8718&r1=8717&r2=8718&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/unfulfilled-2-test.solution Fri Feb 15 14:02:17 2008 @@ -1,11 +1,9 @@

!> Installing unfulfilled from channel test !> 1 problems found: !> Problem: ->!> unfulfilled cannot be installed due to missing dependencies ->!> There are no installable providers of nothere for unfulfilled-1.0-1.noarch[test] +>!> nothing provides nothere needed by unfulfilled-1.0-1.noarch +>!> !> Solution: ->!> do not install unfulfilled ->!> do not install unfulfilled-1.0-1.noarch[test] ->!> Solution: ->!> Ignore this requirement just here +>!> do not install unfulfilled-1.0-1.noarch !> +>!> 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=8718&r1=8717&r2=8718&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 Fri Feb 15 14:02:17 2008 @@ -1,14 +1,12 @@

!> Uninstalling foo !> 1 problems found: !> Problem: ->!> foo2 has missing dependencies ->!> There are no alternative providers of foo installed for foo2-1.0-1.noarch +>!> foo2-1.0-1.noarch requires foo, but none of the providers can be installed +>!> !> Solution: ->!> keep foo ->!> keep foo-1.0-1.noarch ->!> Solution: ->!> delete foo2 ->!> delete foo2-1.0-1.noarch +>!> deinstallation of foo2-1.0-1.noarch +>!> !> Solution: ->!> Ignore this requirement just here +>!> keep foo !> +>!> No valid solution found.

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