Author: schubi2 Date: Fri Feb 15 18:00:47 2008 New Revision: 8752 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8752&view=rev Log: other layout of solvables Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-nodelete-single-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution Fri Feb 15 18:00:47 2008 @@ -1,7 +1,7 @@
!> Doing distribution upgrade ... ->!> 1: I__s_[S12:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U_Th_[S13:1]sat::solvable(4|A2-2.0-1.noarch){upgrade} ->!> 3: U__s_[S14:1]sat::solvable(3|A_new-2.0-1.noarch){upgrade} +>!> 1: I__s_(2)A-1.0-1.noarch(@System) +>!> 2: U_Th_(4)A2-2.0-1.noarch(upgrade) +>!> 3: U__s_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A2-2.0-1.noarch[upgrade] !> delete A-1.0-1.noarch[@System]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution Fri Feb 15 18:00:47 2008 @@ -1,7 +1,7 @@
!> Doing distribution upgrade ... ->!> 1: I__s_[S12:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U_Th_[S13:1]sat::solvable(4|A2-2.0-1.noarch){upgrade} ->!> 3: U__s_[S14:1]sat::solvable(3|A_new-2.0-1.noarch){upgrade} +>!> 1: I__s_(2)A-1.0-1.noarch(@System) +>!> 2: U_Th_(4)A2-2.0-1.noarch(upgrade) +>!> 3: U__s_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A2-2.0-1.noarch[upgrade] !> delete A-1.0-1.noarch[@System]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution Fri Feb 15 18:00:47 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... ->!> 1: I_Th_[S9:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U_Th_[S10:1]sat::solvable(3|A_new-2.0-1.noarch){upgrade} +>!> 1: I_Th_(2)A-1.0-1.noarch(@System) +>!> 2: U_Th_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A_new-2.0-1.noarch[upgrade] !> delete A-1.0-1.noarch[@System]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution Fri Feb 15 18:00:47 2008 @@ -1,9 +1,9 @@
!> Doing distribution upgrade ... ->!> 1: I_Th_[S18:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U_Th_[S19:1]sat::solvable(4|A_new-2.0-1.noarch){upgrade} ->!> 3: I_Th_[S20:1]sat::solvable(3|B-1.0-1.noarch){@System} ->!> 4: U_Th_[S21:1]sat::solvable(5|B_new-2.0-1.noarch){upgrade} ->!> 5: U__s_[S22:1]sat::solvable(6|C_new-2.0-1.noarch){upgrade} +>!> 1: I_Th_(2)A-1.0-1.noarch(@System) +>!> 2: U_Th_(4)A_new-2.0-1.noarch(upgrade) +>!> 3: I_Th_(3)B-1.0-1.noarch(@System) +>!> 4: U_Th_(5)B_new-2.0-1.noarch(upgrade) +>!> 5: U__s_(6)C_new-2.0-1.noarch(upgrade) !> Solution : !> install A_new-2.0-1.noarch[upgrade] !> install B_new-2.0-1.noarch[upgrade]
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.dep... ============================================================================== --- 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 18:00:47 2008 @@ -1,4 +1,4 @@
!> Doing distribution upgrade ... ->!> 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} +>!> 1: I__s_(2)A-1.0-1.noarch(@System) +>!> 2: U__s_(3)B-2.0-1.noarch(upgrade) !> Solution :
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution Fri Feb 15 18:00:47 2008 @@ -1,7 +1,7 @@
!> Doing distribution upgrade ... ->!> 1: I__s_[S6:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U__s_[S7:1]sat::solvable(3|A-2.0-1.noarch){upgrade1} ->!> 3: U_Th_[S8:1]sat::solvable(4|A-2.0-2.noarch){upgrade2} +>!> 1: I__s_(2)A-1.0-1.noarch(@System) +>!> 2: U__s_(3)A-2.0-1.noarch(upgrade1) +>!> 3: U_Th_(4)A-2.0-2.noarch(upgrade2) !> Solution : !> install A-2.0-2.noarch[upgrade2] !> update A-1.0-1.noarch[@System]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.dep... ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution Fri Feb 15 18:00:47 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... ->!> 1: I__s_[S5:1]sat::solvable(2|A-1.0-1.noarch){@System} ->!> 2: U_Th_[S6:1]sat::solvable(3|A-2.0-1.noarch){upgrade} +>!> 1: I__s_(2)A-1.0-1.noarch(@System) +>!> 2: U_Th_(3)A-2.0-1.noarch(upgrade) !> Solution : !> install A-2.0-1.noarch[upgrade] !> update A-1.0-1.noarch[@System]
-- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org