December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11873 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: mlschroe Date: Thu Dec 4 18:06:07 2008 New Revision: 11873 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11873&view=rev Log: - real fix for #450226 - also speeds up solving a lot Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Dec 4 18:06:07 2008 @@ -2823,8 +2823,8 @@ int qcount; POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended packages\n"); - queue_empty(&dq); - queue_empty(&dqs); + queue_empty(&dq); /* recommended packages */ + queue_empty(&dqs); /* supplemented packages */ for (i = 1; i < pool->nsolvables; i++) { if (solv->decisionmap[i] < 0) @@ -2867,12 +2867,11 @@ continue; if (!solver_is_supplementing(solv, s)) continue; - if (solv->ignorealreadyrecommended && solv->installed) - queue_pushunique(&dqs, i); /* needs filter */ - else - queue_pushunique(&dq, i); + queue_push(&dqs, i); } } + + /* filter out all already supplemented packages if requested */ if (solv->ignorealreadyrecommended && dqs.count) { /* turn off all new packages */ @@ -2886,15 +2885,16 @@ solv->decisionmap[p] = -solv->decisionmap[p]; } /* filter out old supplements */ - for (i = 0; i < dqs.count; i++) + for (i = j = 0; i < dqs.count; i++) { p = dqs.elements[i]; s = pool->solvables + p; if (!s->supplements) continue; if (!solver_is_supplementing(solv, s)) - queue_pushunique(&dq, p); + dqs.elements[j++] = p; } + dqs.count = j; /* undo turning off */ for (i = 0; i < solv->decisionq.count; i++) { @@ -2906,6 +2906,111 @@ solv->decisionmap[p] = -solv->decisionmap[p]; } } + + /* make dq contain both recommended and supplemented pkgs */ + if (dqs.count) + { + for (i = 0; i < dqs.count; i++) + queue_pushunique(&dq, dqs.elements[i]); + } + +#if 1 + if (dq.count) + { + Map dqmap; + int decisioncount; + + if (dq.count == 1) + { + /* simple case, just one package. no need to choose */ + p = dq.elements[0]; + if (dqs.count) + POOL_DEBUG(SAT_DEBUG_POLICY, "installing supplemented %s\n", solvable2str(pool, pool->solvables + p)); + else + POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + level = setpropagatelearn(solv, level, p, 0); + continue; + } + + /* filter and create a map of result */ + policy_filter_unwanted(solv, &dq, POLICY_MODE_RECOMMEND); + map_init(&dqmap, pool->nsolvables); + for (i = 0; i < dq.count; i++) + MAPSET(&dqmap, dq.elements[i]); + + /* install all supplemented packages */ + for (i = 0; i < dqs.count; i++) + { + p = dqs.elements[i]; + if (solv->decisionmap[p] || !MAPTST(&dqmap, p)) + continue; + POOL_DEBUG(SAT_DEBUG_POLICY, "installing supplemented %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + olevel = level; + level = setpropagatelearn(solv, level, p, 0); + if (level <= olevel) + break; + } + if (i < dqs.count) + { + map_free(&dqmap); + continue; + } + + /* install all recommended packages */ + /* more work as we want to created branches if multiple + * choices are valid */ + decisioncount = solv->decisionq.count; + for (i = 0; i < decisioncount; i++) + { + Id rec, *recp, pp; + p = solv->decisionq.elements[i]; + if (p < 0) + continue; + s = pool->solvables + p; + if (!s->repo || (solv->ignorealreadyrecommended && s->repo == solv->installed)) + continue; + if (!s->recommends) + continue; + recp = s->repo->idarraydata + s->recommends; + while ((rec = *recp++) != 0) + { + queue_empty(&dq); + FOR_PROVIDES(p, pp, rec) + { + if (solv->decisionmap[p] > 0) + { + dq.count = 0; + break; + } + else if (solv->decisionmap[p] == 0 && MAPTST(&dqmap, p)) + queue_pushunique(&dq, p); + } + if (!dq.count) + continue; + if (dq.count > 1) + { + /* multiple candidates, open a branch */ + for (i = 1; i < dq.count; i++) + queue_push(&solv->branches, dq.elements[i]); + queue_push(&solv->branches, -level); + } + p = dq.elements[0]; + POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + olevel = level; + level = setpropagatelearn(solv, level, p, 0); + if (level <= olevel || solv->decisionq.count < decisioncount) + break; + } + if (rec) + break; /* had a problem above, quit loop */ + } + map_free(&dqmap); + continue; + } +#else if (dq.count) { if (dq.count > 1) @@ -2924,6 +3029,7 @@ level = setpropagatelearn(solv, level, p, 0); continue; } +#endif } if (solv->distupgrade && solv->installed) @@ -3009,7 +3115,7 @@ /* kill old solvable so that we do not loop */ p = solv->branches.elements[lasti]; solv->branches.elements[lasti] = 0; - POOL_DEBUG(SAT_DEBUG_STATS, "minimizing %d -> %d with %s\n", solv->decisionmap[p], l, solvable2str(pool, pool->solvables + p)); + POOL_DEBUG(SAT_DEBUG_STATS, "minimizing %d -> %d with %s\n", solv->decisionmap[p], lastl, solvable2str(pool, pool->solvables + p)); minimizationsteps++; level = lastl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11872 - in /trunk/zypper/doc: TODO zypper.8
by jkupec＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: jkupec Date: Thu Dec 4 17:54:54 2008 New Revision: 11872 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11872&view=rev Log: - --no-recommends added to the man page Modified: trunk/zypper/doc/TODO trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/TODO?rev=11872&r1=118… ============================================================================== --- trunk/zypper/doc/TODO (original) +++ trunk/zypper/doc/TODO Thu Dec 4 17:54:54 2008 @@ -29,6 +29,8 @@ patches have been installed + zypper up --some-option repofoo (like 'rug up repo'?) - update packages from specified repos without disabling the others ++ zypper lu --some-option to make it list any newer versions of installed + packages, regardless whether they are installable or not. Packages Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11872&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Thu Dec 4 17:54:54 2008 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "1.0.1" "zypper" "System Tools" +.TH "zypper" "8" "1.0.3" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] @@ -92,6 +92,15 @@ Throughout this manual we will refer to resolvables simply as \fIpackages\fR and to resolvable types as \fIpackage types\fR. +.SS Package Dependencies +.LP +Software packages depend on each other in various ways. Packages usually +require or recommend other packages, they can declare that they conflict +with other packages, etc. Packages can also depend on specific hardware. +See http://en.opensuse.org/Software_Management/Dependencies for more +information. Zypper utilizes a \fIdependency solver\fR to find out what +packages are needed to be installed according to user's request. + .SH "COMMANDS" .LP @@ -238,7 +247,12 @@ Create solver test case for debugging. Use this option, if you think the dependencies were not solved all right and attach the resulting /var/log/zypper.solverTestCase directory to your bug report. To use this option, simply add it to the problematic -install or remove command. +install or remove command. +.TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. .TP .I \-R, \-\-no\-force\-resolution Do not force the solver to find a solution. Instead, report @@ -281,6 +295,12 @@ to install or remove to fix them. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones +(the ones needed to fix broken dependencies in this case). +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \-D, \-\-dry-run Test the repair, do not actually do anything to the system. .TP @@ -420,6 +440,11 @@ .I \ \ \ \ \-\-debug\-solver Create solver test case for debugging. See the install command for details. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \-R, \-\-no\-force\-resolution Do not force the solver to find a solution. Instead, report dependency problem and prompt the user to resolve it manually. @@ -499,6 +524,11 @@ .I \-l, \-\-auto\-agree\-with\-licenses Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \ \ \ \ \-\-debug\-solver Create solver test case for debugging. See the install command for details. .TP -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11871 - /trunk/sat-solver/cmake/modules/FindCheck.cmake
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 17:50:46 2008 New Revision: 11871 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11871&view=rev Log: fix 'check' test for cmake > 2.4 Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/cmake/modules/FindChe… ============================================================================== --- trunk/sat-solver/cmake/modules/FindCheck.cmake (original) +++ trunk/sat-solver/cmake/modules/FindCheck.cmake Thu Dec 4 17:50:46 2008 @@ -9,13 +9,13 @@ # Look for the library. FIND_LIBRARY(CHECK_LIBRARY NAMES check) -IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) +IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) # handle the QUIETLY and REQUIRED arguments and set CHECK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Check "Please install 'check' and 'check-devel' packages" CHECK_LIBRARY CHECK_INCLUDE_DIR) -ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) +ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) IF(CHECK_FOUND) SET( CHECK_LIBRARIES ${CHECK_LIBRARY} ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11870 - /trunk/sat-solver/bindings/python/tests/search.py
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 17:42:09 2008 New Revision: 11870 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11870&view=rev Log: test filelist search Modified: trunk/sat-solver/bindings/python/tests/search.py Modified: trunk/sat-solver/bindings/python/tests/search.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/search.py (original) +++ trunk/sat-solver/bindings/python/tests/search.py Thu Dec 4 17:42:09 2008 @@ -20,7 +20,7 @@ repo = pool.add_solv( "os11-biarch.solv" ) repo.set_name("test") i = 0 - for d in pool.search("yast2", satsolver.SEARCH_STRING): + for d in pool.search("yast2", satsolver.SEARCH_STRING,None,"solvable:filelist"): print d.solvable(), "matches 'yast2' in ", d.keyname(), ": ", d.value() i = i + 1 if i > 10: -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11869 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 15:15:33 2008 New Revision: 11869 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11869&view=rev Log: beginning of tests for decision reasons Added: trunk/sat-solver/bindings/ruby/tests/reasons.rb Added: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Thu Dec 4 15:15:33 2008 @@ -0,0 +1,47 @@ +# +# reasons.rb +# test decision reasons +# + +$:.unshift "../../../build/bindings/ruby" + +require 'test/unit' +require 'satsolver' + +class ReasonsTest < Test::Unit::TestCase + def setup + @pool = Satsolver::Pool.new + @pool.arch = "i686" + @repo = @pool.create_repo( 'test' ) + end + def test_simple_requires + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + rel = @pool.create_relation( "A", Satsolver::REL_EQ, "1.0-0" ) + assert rel + + # B-1.0-0 requires A = 1.0-0 + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + puts "#{solver.decision_count} decisions" + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.reason})" + end + end +end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11868 - /trunk/sat-solver/bindings/decision.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 15:14:51 2008 New Revision: 11868 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11868&view=rev Log: add 'op_s': decision operator as string Modified: trunk/sat-solver/bindings/decision.i Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Thu Dec 4 15:14:51 2008 @@ -22,6 +22,16 @@ { return $self->pool; } int op() { return $self->op; } + const char *op_s() + { switch ($self->op) { + case DECISION_INSTALL: return "install"; + case DECISION_REMOVE: return "remove"; + case DECISION_UPDATE: return "update"; + case DECISION_OBSOLETE: return "obsolete"; + default: break; + } + return "unknown"; + } XSolvable *solvable() { return xsolvable_new( $self->pool, $self->solvable ); } XSolvable *reason() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11867 - /trunk/sat-solver/bindings/relation.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:44:06 2008 New Revision: 11867 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11867&view=rev Log: handle more than just standard ops Modified: trunk/sat-solver/bindings/relation.i Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Thu Dec 4 13:44:06 2008 @@ -71,12 +71,22 @@ "", ">", "=", ">=", "<", "<>", "<=", "<=>" }; - int op = 0; + unsigned int op = 0; if (ISRELDEP( $self->id )) { Reldep *rd = GETRELDEP( $self->pool, $self->id ); op = rd->flags; } - return ops[op % 8]; + if (op < 8) + return ops[op]; + switch (op) { + case REL_AND: return "and"; + case REL_OR: return "or"; + case REL_WITH: return "with"; + case REL_NAMESPACE: return "namespace"; + case REL_ARCH: return "arch"; + default: break; + } + return "<op>"; } #if defined(SWIGRUBY) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11866 - in /trunk/sat-solver/bindings/ruby/tests: covenants.rb decisions.rb problems.rb repodata.rb search.rb solutions.rb solvable.rb solver.rb
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:10:35 2008 New Revision: 11866 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11866&view=rev Log: make (most) Ruby tests work again Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/ruby/tests/problems.rb trunk/sat-solver/bindings/ruby/tests/repodata.rb trunk/sat-solver/bindings/ruby/tests/search.rb trunk/sat-solver/bindings/ruby/tests/solutions.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/ruby/tests/solver.rb Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/c… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/covenants.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/covenants.rb Thu Dec 4 13:10:35 2008 @@ -15,16 +15,23 @@ assert repo.size > 0 repo.name = "test" + first = second = nil + repo.each do |s| + if first + second = s + break + else + first = s + end + end + solver = pool.create_solver solver.include( "foo" ) - puts "Hi" - puts "#{repo[0]}" - puts "Ho" - solver.include( repo[0] ) + solver.include( first ) solver.include( Satsolver::Relation.new( pool, "foo", Satsolver::REL_EQ, "42-7" ) ) solver.exclude( "bar" ) - solver.exclude( repo[1] ) + solver.exclude( second ) solver.exclude( Satsolver::Relation.new( pool, "bar", Satsolver::REL_EQ, "42-7" ) ) assert solver.covenants_count == 6 solver.each_covenant do |c| Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/d… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Thu Dec 4 13:10:35 2008 @@ -59,7 +59,8 @@ transaction.install( solv3 ) transaction.remove( "D" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Thu Dec 4 13:10:35 2008 @@ -47,14 +47,13 @@ require 'test/unit' require 'satsolver' -def solve_and_check solver, transaction, problem +def solve_and_check solver, transaction, reason - assert solver.problems? - puts "[#{problem}] Problems found" +# assert solver.problems? i = 0 found = false solver.each_problem( transaction ) { |p| - found = true if p.reason == problem + found = true if p.reason == reason i += 1 case p.reason when Satsolver::SOLVER_PROBLEM_UPDATE_RULE #1 @@ -106,19 +105,22 @@ def test_update_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_UPDATE_RULE ) end def test_job_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_RULE ) end def test_job_nothing_provides transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) end @@ -127,7 +129,8 @@ solv = @pool.find( "A", @repo ) solv.requires << @pool.create_relation( "ZZ" ) transaction.install( solv ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) end @@ -138,7 +141,8 @@ solvB = @pool.find( "B", @repo ) solvB.requires << @pool.create_relation( "ZZ" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) end @@ -148,7 +152,8 @@ transaction.install( solvA ) solvA = @repo.create_solvable( "A", "2.0-0" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_SAME_NAME ) end @@ -160,7 +165,8 @@ solvB.conflicts << @pool.create_relation( solvA.name, Satsolver::REL_EQ, solvA.evr ) transaction.install( solvA ) transaction.install( solvB ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) end @@ -169,13 +175,15 @@ solvCC = @pool.find( "CC", @repo ) solvCC.obsoletes << @pool.create_relation( "A" ) transaction.install( solvCC ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) end def test_providers_not_installable transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) end Modified: trunk/sat-solver/bindings/ruby/tests/repodata.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repodata.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repodata.rb Thu Dec 4 13:10:35 2008 @@ -31,7 +31,7 @@ repodata = repo.data(0) assert repodata - puts "Repodata is at '#{repodata.location}' with #{repodata.keysize} keys" + puts "Repodata has #{repodata.keysize} keys" repodata.each_key { |k| puts " Key '#{k.name}' is #{k.type}[#{k.type_id}] with #{k.size} bytes" } Modified: trunk/sat-solver/bindings/ruby/tests/search.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/search.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/search.rb Thu Dec 4 13:10:35 2008 @@ -22,20 +22,22 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in pool.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_pool_search_files(self): - pool = satsolver.Pool() + def test_pool_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in pool.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end # # Repo search @@ -49,20 +51,21 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in repo.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_repo_search_files(self): - pool = satsolver.Pool() + def test_repo_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in repo.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end -if __name__ == '__main__': - unittest.main() +end \ No newline at end of file Modified: trunk/sat-solver/bindings/ruby/tests/solutions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solutions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solutions.rb Thu Dec 4 13:10:35 2008 @@ -45,7 +45,8 @@ transaction.install( solv1 ) transaction.remove( "Z" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) # solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Thu Dec 4 13:10:35 2008 @@ -17,7 +17,7 @@ end deps.each { |d| - puts "\t#{d.name} #{d.op} #{d.evr}" + puts "\t#{d.name} #{d.op_s} #{d.evr}" } end @@ -30,20 +30,17 @@ @pool.add_solv( solvpath ) assert @pool.size > 0 end - def test_solvable - solv = @pool[2] - assert solv - puts solv - puts "#{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" - end def test_deps - return + i = 0 + puts "test_deps" @pool.each { |s| - puts s + puts "Solvable >#{s}<" show_dep "Provides", s.provides show_dep "Requires", s.requires show_dep "Obsoletes", s.obsoletes show_dep "Conflicts", s.conflicts + i += 1 + break if i > 5 } end def test_creation @@ -71,7 +68,7 @@ transaction = @pool.create_transaction transaction.install( solv1 ) - solver = @pool.create_solver( @pool.create_repo( "system" ) ) + solver = @pool.create_solver( ) # @pool.debug = 255 solver.solve( transaction ) solver.each_to_install { |s| Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Thu Dec 4 13:10:35 2008 @@ -19,7 +19,8 @@ transaction.install( "A" ) transaction.remove( "xorg-x11" ) - solver = Satsolver::Solver.new( pool, system ) + pool.installed = system + solver = Satsolver::Solver.new( pool ) solver.allow_uninstall = true assert solver.allow_uninstall pool.prepare -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11865 - in /trunk/sat-solver/bindings: perl/CMakeLists.txt python/CMakeLists.txt ruby/CMakeLists.txt
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:10:10 2008 New Revision: 11865 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11865&view=rev Log: remove features from swig cmdline, those are set in satsolver.i Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt trunk/sat-solver/bindings/python/CMakeLists.txt trunk/sat-solver/bindings/ruby/CMakeLists.txt Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/perl/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/perl/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/perl/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -33,7 +33,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Perl ..." - COMMAND ${SWIG_EXECUTABLE} -perl -features autodoc -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -perl -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -26,7 +26,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." - COMMAND ${SWIG_EXECUTABLE} -python -features autodoc -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -python -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -1,8 +1,9 @@ # # CMakeLists.txt for bindings/ruby # + ENABLE_TESTING() -#ADD_SUBDIRECTORY(tests) +ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target @@ -15,7 +16,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." - COMMAND ${SWIG_EXECUTABLE} -ruby -features autodoc -autorename -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -ruby -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11864 - in /trunk/sat-solver/bindings: dataiterator.i satsolver.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:08:55 2008 New Revision: 11864 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11864&view=rev Log: factorize Dataiterator constructor/destructor out so Repo::search can use it Modified: trunk/sat-solver/bindings/dataiterator.i trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/dataiterator.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dataiterator… ============================================================================== --- trunk/sat-solver/bindings/dataiterator.i (original) +++ trunk/sat-solver/bindings/dataiterator.i Thu Dec 4 13:08:55 2008 @@ -6,7 +6,6 @@ %rename(Dataiterator) _Dataiterator; typedef struct _Dataiterator {} Dataiterator; - %extend Dataiterator { %constant int SEARCH_STRINGMASK = SEARCH_STRINGMASK; %constant int SEARCH_STRING = SEARCH_STRING; @@ -33,21 +32,10 @@ Dataiterator(Pool *pool, Repo *repo, const char *match, int option, XSolvable *xs = 0, const char *keyname = 0) { - Dataiterator *di = calloc(1, sizeof( Dataiterator )); - Solvable *s = 0; - /* cope with pool or repo being NULL */ - if (!pool) { - if (!repo) { - /* raise exception (FIXME) */ - } - pool = repo->pool; - } - if (xs) s = xsolvable_solvable(xs); - dataiterator_init(di, pool, repo, s ? s - s->repo->pool->solvables : 0, keyname && pool ? str2id(pool, keyname, 0) : 0, match, option); - return di; + return swig_dataiterator_new(pool, repo, match, option, xs, keyname); } - ~Dataiterator() { dataiterator_free($self); free( $self ); } + ~Dataiterator() { swig_dataiterator_free($self); } XSolvable *solvable() { Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Thu Dec 4 13:08:55 2008 @@ -16,6 +16,10 @@ %module satsolver %feature("autodoc","1"); +#if defined(SWIGRUBY) +%include <ruby.swg> +#endif + %{ /*=============================================================*/ @@ -144,6 +148,38 @@ } #endif +/* + * create Dataiterator + * (used by dataiterator.i and pool.search) + */ + +static Dataiterator * +swig_dataiterator_new(Pool *pool, Repo *repo, const char *match, int option, XSolvable *xs, const char *keyname) +{ + Dataiterator *di = calloc(1, sizeof( Dataiterator )); + Solvable *s = 0; + /* cope with pool or repo being NULL */ + if (!pool) { + if (!repo) { + /* raise exception (FIXME) */ + } + pool = repo->pool; + } + if (xs) s = xsolvable_solvable(xs); + dataiterator_init(di, pool, repo, s ? s - s->repo->pool->solvables : 0, keyname && pool ? str2id(pool, keyname, 0) : 0, match, option); + return di; +} + +/* + * destroy Dataiterator + */ +void +swig_dataiterator_free(Dataiterator *di) +{ + dataiterator_free(di); + free( di ); +} + /* convert Dataiterator to target value * if *more != 0 on return, value is incomplete */ @@ -253,6 +289,7 @@ /* types and typemaps */ #if defined(SWIGRUBY) + /* * FILE * to Ruby * (copied from /usr/share/swig/ruby/file.i) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0