Author: coolo Date: Fri Oct 19 07:54:39 2007 New Revision: 7560 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7560&view=rev Log: implement distupgrade for dummies Modified: trunk/sat-solver/testsuite/README.FAILS trunk/sat-solver/testsuite/deptestomatic.c Modified: trunk/sat-solver/testsuite/README.FAILS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/README.FAILS?rev=7560&r1=7559&r2=7560&view=diff ============================================================================== --- trunk/sat-solver/testsuite/README.FAILS (original) +++ trunk/sat-solver/testsuite/README.FAILS Fri Oct 19 07:54:39 2007 @@ -19,7 +19,10 @@ ./data.libzypp/yast-tests/bug155368-force-test.xml libzypp removes broken pack, mls changes version -#./data.libzypp/bugzilla-tests/Bug217574-test.xml +./data.libzypp/basic-exercises/exercise-25-test.xml +./data.libzypp/basic-exercises/exercise-26-test.xml + promotecho is only enabled for redcarpet + ./data.libzypp/bugzilla-tests/bug225218-test.xml ./data.libzypp/bugzilla-tests/bug308098-test.xml ./data.libzypp/bugzilla-tests/bug310618-test.xml @@ -27,32 +30,11 @@ ./data.libzypp/distupgrade-tests/rename-multiple-test.xml ./data.libzypp/distupgrade-tests/rename-single-test.xml ./data.libzypp/distupgrade-tests/rename-version-cap-test.xml -#./data.libzypp/distupgrade-tests/unmaintained-nodelete-single-test.xml ./data.libzypp/distupgrade-tests/unmaintained-single-test.xml -./data.libzypp/distupgrade-tests/upgrade-multiple-test.xml -./data.libzypp/distupgrade-tests/upgrade-single-test.xml -./data.libzypp/kernel-tests/1_1_1-default-test.xml -./data.libzypp/kernel-tests/1_1_1-smp-test.xml -./data.libzypp/kernel-tests/1_1_2-default-test.xml -./data.libzypp/kernel-tests/1_1_2-smp-test.xml -./data.libzypp/kernel-tests/1_1_3-default-test.xml -./data.libzypp/kernel-tests/1_1_3-smp-test.xml -#./data.libzypp/kernel-tests/1_2_1-default-test.xml -#./data.libzypp/kernel-tests/1_2_1-smp-test.xml -#./data.libzypp/kernel-tests/1_2_2-default-test.xml -#./data.libzypp/kernel-tests/1_2_2-smp-test.xml -./data.libzypp/kernel-tests/1_2_3-default-test.xml -./data.libzypp/kernel-tests/1_2_3-smp-test.xml -./data.libzypp/kernel-tests/2_1-default-test.xml -./data.libzypp/kernel-tests/2_1-smp-test.xml -#./data.libzypp/kernel-tests/2_2_1-default-test.xml -#./data.libzypp/kernel-tests/2_2_1-smp-test.xml -#./data.libzypp/kernel-tests/2_2_2-default-test.xml -./data.libzypp/yast-tests/Bug156439-test.xml +./data.libzypp/kernel-tests/1_2_1-default-test.xml +./data.libzypp/kernel-tests/1_2_1-smp-test.xml +./data.libzypp/kernel-tests/1_2_2-default-test.xml +./data.libzypp/kernel-tests/1_2_2-smp-test.xml ./data.libzypp/yast-tests/exercise-06upgrade-test.xml - distupgrade unhandled - -./data.libzypp/basic-exercises/exercise-25-test.xml -./data.libzypp/basic-exercises/exercise-26-test.xml - promotecho is only enabled for redcarpet + distupgrade not yet working completely Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=7560&r1=7559&r2=7560&view=diff ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Fri Oct 19 07:54:39 2007 @@ -955,6 +955,13 @@ } break; + case STATE_DISTUPGRADE: + pd->updatesystem = 1; + //pd->fixsystem = 1; + pd->allowuninstall = 1; + //pd->allowdowngrade = 1; + break; + case STATE_UPGRADE: { pd->updatesystem = 1; } @@ -1012,10 +1019,8 @@ solv->updatesystem = pd->updatesystem; solv->allowdowngrade = pd->allowdowngrade; solv->allowuninstall = pd->allowuninstall; - solv->noupdateprovide = 0; solv->rc_output = redcarpet ? 2 : 1; solv->noupdateprovide = 1; - //solv->ignorerecommends = 1; pd->pool->verbose = verbose; // Solve ! -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org