December 2008 - Zypp Commits - openSUSE Mailing Lists

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

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:41:37 2008 New Revision: 11893 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11893&view=rev Log: clean up bash install test by not installing recommends (recommends are not properly reflected in decisionq_why yet) Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: 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 (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:41:37 2008 @@ -223,6 +223,7 @@ @pool.prepare solver = @pool.create_solver( ) + solver.dont_install_recommended = true solver.solve( transaction ) solver.each_to_install { |s| puts "Install #{s}" -- 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] r11892 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Test.cc package/libzypp.changes zypp/HistoryLog.cc zypp/solver/detail/SATResolver.cc
by mlandres＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlandres Date: Fri Dec 5 14:28:47 2008 New Revision: 11892 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11892&view=rev Log: - Fix solvers inappropriate selection as byUSER (bnc 455965) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Test.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/HistoryLog.cc trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11892&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Dec 5 14:28:47 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") # -# LAST RELEASED: 5.24.5 (23) +# LAST RELEASED: 5.24.6 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/Test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Test.cc?r… ============================================================================== --- trunk/libzypp/devel/devel.ma/Test.cc (original) +++ trunk/libzypp/devel/devel.ma/Test.cc Fri Dec 5 14:28:47 2008 @@ -3,6 +3,22 @@ #include <zypp/sat/LookupAttr.h> + static std::string pidAndAppname() + { + static std::string _val; + if ( _val.empty() ) + { + pid_t mypid = getpid(); + Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); + Pathname myname( filesystem::readlink( p ) ); + + _val += str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; + } + /****************************************************************** ** ** FUNCTION NAME : main @@ -12,6 +28,11 @@ { INT << "===[START]==========================================" << endl; + SEC << pidAndAppname() << endl; + + + INT << "===[END]============================================" << endl << endl; + return 0; Pathname mroot( "/tmp/Bb" ); TestSetup test( mroot, Arch_x86_64 ); test.loadRepo( "/Local/ROOT/cache/raw/11.1-update" ); @@ -36,6 +57,8 @@ MIL << it << endl; } + + INT << "===[END]============================================" << endl << endl; return 0; } Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Dec 5 14:28:47 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 5 14:22:11 CET 2008 - ma(a)suse.de + +- Fix solvers inappropriate selection as byUSER (bnc 455965) +- revision 11891 +- version 5.24.6 (23) + +------------------------------------------------------------------- Thu Dec 4 11:10:35 CET 2008 - coolo(a)suse.de - fix %post script to not warn on fresh install Modified: trunk/libzypp/zypp/HistoryLog.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/HistoryLog.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/HistoryLog.cc (original) +++ trunk/libzypp/zypp/HistoryLog.cc Fri Dec 5 14:28:47 2008 @@ -47,6 +47,22 @@ } return result; } + + static std::string pidAndAppname() + { + static std::string _val; + if ( _val.empty() ) + { + pid_t mypid = getpid(); + zypp::Pathname p( "/proc/"+zypp::str::numstring(mypid)+"/exe" ); + zypp::Pathname myname( zypp::filesystem::readlink( p ) ); + + _val += zypp::str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; + } } namespace zypp @@ -239,10 +255,11 @@ << _sep << p->edition() // 4 evr << _sep << p->arch(); // 5 arch - if (pi.status().isByUser()) + // ApplLow is what the solver selected on behalf of the user. + if (pi.status().isByUser() || pi.status().isByApplLow() ) _log << _sep << userAtHostname(); // 6 reqested by - //else if (pi.status().isByApplHigh() || pi.status().isByApplLow()) - // _log << _sep << "appl"; + else if (pi.status().isByApplHigh()) + _log << _sep << pidAndAppname(); else _log << _sep; @@ -269,10 +286,11 @@ << _sep << p->edition() // 4 evr << _sep << p->arch(); // 5 arch - if (pi.status().isByUser()) + // ApplLow is what the solver selected on behalf of the user. + if ( pi.status().isByUser() || pi.status().isByApplLow() ) _log << _sep << userAtHostname(); // 6 reqested by - //else if (pi.status().isByApplHigh() || pi.status().isByApplLow()) - // _log << _sep << "appl"; + else if (pi.status().isByApplHigh()) + _log << _sep << pidAndAppname(); else _log << _sep; Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Dec 5 14:28:47 2008 @@ -584,17 +584,15 @@ } // Solvables which were selected due requirements which have been made by the user will - // be selected by USER. - // FIXME: The request queue should contains the TransactBy field - // ma: this is also deadly for the UI as it converts the requirement into a fix selection, - // which will serve as user input on the next solver run. + // be selected by APPL_LOW. We can't use any higher level, because this setting must + // not serve as a request for the next solver run. APPL_LOW is reset before solving. for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { sat::WhatProvides rpmProviders(*iter); for_( iter2, rpmProviders.begin(), rpmProviders.end() ) { PoolItem poolItem(*iter2); if (poolItem.status().isToBeInstalled()) { MIL << "User requirement " << *iter << " sets " << poolItem << endl; - poolItem.status().setTransactByValue (ResStatus::USER); + poolItem.status().setTransactByValue (ResStatus::APPL_LOW); } } } @@ -604,7 +602,7 @@ PoolItem poolItem(*iter2); if (poolItem.status().isToBeUninstalled()) { MIL << "User conflict " << *iter << " sets " << poolItem << endl; - poolItem.status().setTransactByValue (ResStatus::USER); + poolItem.status().setTransactByValue (ResStatus::APPL_LOW); } } } -- 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] r11891 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:22:42 2008 New Revision: 11891 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11891&view=rev Log: test allowuninstall Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: 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 (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:22:42 2008 @@ -60,7 +60,11 @@ end else # d < 0 if p < 0 - "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + if d == -1 + "del! #{to_solvable(pool, -p)}" + else + "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + end else "error p #{p}, d #{d}, w1 #{w1}, w2 {w2}" end @@ -320,4 +324,44 @@ puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end + def test_indirect_removal + 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, "42" ) + assert rel + solv1.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0. Removal of A should remove B" + solv2.requires << rel + assert solv2.requires.size == 1 + + @pool.installed = @repo + + transaction = @pool.create_transaction + transaction.remove( solv1 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.allow_uninstall = true + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + 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] r11890 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:13:47 2008 New Revision: 11890 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11890&view=rev Log: add obsoletes and conflicts test Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: 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 (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:13:47 2008 @@ -41,7 +41,11 @@ if p > 0 "or! #{to_solvable(pool, p)}, #{to_solvable(pool, w2)}" else - "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + if w2 > 0 + "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + else + "bin! #{to_solvable(pool, -p)} obsoletes #{to_solvable(pool, -w2)}" + end end else # p != w1 "error d = 0, w2 = #{w2}, p #{p} != w1 #{w1}" @@ -185,9 +189,6 @@ transaction.install( solv2 ) @pool.prepare - @pool.each_provider(rel) do |p| - puts "#{p} provides #{rel}" - end solver = @pool.create_solver( ) solver.solve( transaction ) solver.each_to_install { |s| @@ -242,6 +243,81 @@ puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end - def test_indirect_requires2 + def test_conflicts + installed = @pool.create_repo( 'installed' ) + solv1 = installed.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + @pool.installed = installed + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + solv2.conflicts << rel + + puts "\n---\nB-1.0-0 conflicts a = 42, provided by installed A-1.0-0" + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_obsoletes + installed = @pool.create_repo( 'installed' ) + solv1 = installed.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + @pool.installed = installed + + rel = @pool.create_relation( "A" ) + assert rel + solv2.obsoletes << rel + + puts "\n---\nB-1.0-0 obsoletes a = 42, provided by installed A-1.0-0" + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + 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] r11889 - /trunk/sat-solver/applayer/decision.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:13:29 2008 New Revision: 11889 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11889&view=rev Log: more comments Modified: trunk/sat-solver/applayer/decision.c Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Fri Dec 5 14:13:29 2008 @@ -95,14 +95,14 @@ { continue; } - else + else /* p > 0 */ { s = p; if (installed) { Solvable *solv = pool_id2solvable( pool, p ); if (solv->repo == installed) - continue; + continue; /* thats a 'keep installed' decision, don't report */ } if (!obsoletesmap[p]) { -- 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] r11888 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:22:12 2008 New Revision: 11888 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11888&view=rev Log: more testcases for digging through decision explanation Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: 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 (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 12:22:12 2008 @@ -6,15 +6,92 @@ $:.unshift "../../../build/bindings/ruby" require 'test/unit' +require 'pathname' require 'satsolver' +module Satsolver + class Rule + def to_solvable pool, id + if (id < 0) + "!#{pool.solvable(-id)}" + else + "#{pool.solvable(id)}" + end + end + def to_s + "p #{p}, d #{d}, w1 #{w1}, w2 #{w2}" + end + def solvables pool + "p #{to_solvable(pool, p)}, d #{to_solvable(pool, d)}, w1 #{to_solvable(pool, w1)}, w2 #{to_solvable(pool, w2)}" + end + def to_dep pool + if d == 0 + if w2 == 0 + if p == w1 + if p > 0 + "install! #{to_solvable(pool, p)}" + else + "remove! #{to_solvable(pool, -p)}" + end + else # p != w1 + "error d = 0, w2 = 0, p #{p} != w1 #{w1}" + end + else # w2 != 0 + if p == w1 + if p > 0 + "or! #{to_solvable(pool, p)}, #{to_solvable(pool, w2)}" + else + "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + end + else # p != w1 + "error d = 0, w2 = #{w2}, p #{p} != w1 #{w1}" + end + end + else # d != 0 + if d > 0 + if p < 0 + "req! #{to_solvable(pool, -p)} requires #{to_solvable(pool, d)}, provided by #{to_solvable(pool, w2)}..." + else + "upd! #{to_solvable(pool, d)} updates #{to_solvable(pool, p)}, provided by #{to_solvable(pool, w2)}..." + end + else # d < 0 + if p < 0 + "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + else + "error p #{p}, d #{d}, w1 #{w1}, w2 {w2}" + end + end + end + end # to_dep + end # class Rule +end + +# SolverProbleminfo to string +def pi_s pi + case pi + when Satsolver::SOLVER_PROBLEM_UPDATE_RULE: "update" + when Satsolver::SOLVER_PROBLEM_JOB_RULE: "job" + when Satsolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: "job nothing provides" + when Satsolver::SOLVER_PROBLEM_NOT_INSTALLABLE: "solvable not installable" + when Satsolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: "nothing provides" + when Satsolver::SOLVER_PROBLEM_SAME_NAME: "same name" + when Satsolver::SOLVER_PROBLEM_PACKAGE_CONFLICT: "conflicts" + when Satsolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES: "obsoletes" + when Satsolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: "requires" + when Satsolver::SOLVER_PROBLEM_SELF_CONFLICT: "self conflict" + when Satsolver::SOLVER_PROBLEM_RPM_RULE: "rpm rule" + else + "unknown" + end +end + class ReasonsTest < Test::Unit::TestCase def setup @pool = Satsolver::Pool.new @pool.arch = "i686" @repo = @pool.create_repo( 'test' ) end - def test_simple_requires + def test_direct_requires solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 solv2 = @repo.create_solvable( 'B', '1.0-0' ) @@ -23,13 +100,51 @@ rel = @pool.create_relation( "A", Satsolver::REL_EQ, "1.0-0" ) assert rel - # B-1.0-0 requires A = 1.0-0 + puts "\n---\nB-1.0-0 requires A = 1.0-0" + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_indirect_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, "42" ) + assert rel + solv1.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0" solv2.requires << rel assert solv2.requires.size == 1 transaction = @pool.create_transaction transaction.install( solv2 ) + @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) solver.each_to_install { |s| @@ -39,9 +154,94 @@ puts "Remove #{s}" } - puts "#{solver.decision_count} decisions" solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end + def test_indirect_requires_choose + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + solv3 = @repo.create_solvable( 'C', '1.0-0' ) + assert solv3 + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + solv3.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0 and C-1.0-0" + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + @pool.each_provider(rel) do |p| + puts "#{p} provides #{rel}" + end + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_install_bash + solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-beta5-i386.solv" + repo = @pool.add_solv( solvpath ) + repo.name = "beta5" + + puts "\n---\nInstalling bash" + transaction = @pool.create_transaction + transaction.install( "bash" ) + + @pool.prepare + 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.rule_count} rules" + puts "rpm(#{solver.rpmrules_start}..#{solver.rpmrules_end})" + puts "feature(#{solver.featurerules_start}..#{solver.featurerules_end})" + puts "update(#{solver.updaterules_start}..#{solver.updaterules_end})" + puts "job(#{solver.jobrules_start}..#{solver.jobrules_end})" + puts "learnt(#{solver.learntrules_start}..#{solver.learntrules_end})" + solver.each_decision do |d| + puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_indirect_requires2 + 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] r11887 - /trunk/sat-solver/bindings/ruby/tests/search.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:21:39 2008 New Revision: 11887 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11887&view=rev Log: test per-repo search Modified: trunk/sat-solver/bindings/ruby/tests/search.rb 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 Fri Dec 5 12:21:39 2008 @@ -51,7 +51,7 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + repo.search("yast2", Satsolver::SEARCH_STRING) do |d| puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" end end @@ -63,7 +63,7 @@ solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) repo.name = "test" - pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + repo.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 -- 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] r11886 - /trunk/sat-solver/bindings/solver.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:21:16 2008 New Revision: 11886 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11886&view=rev Log: add Solver::explain to get reasons for a decision expose rule counter internals Modified: trunk/sat-solver/bindings/solver.i Modified: trunk/sat-solver/bindings/solver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solver.i?rev… ============================================================================== --- trunk/sat-solver/bindings/solver.i (original) +++ trunk/sat-solver/bindings/solver.i Fri Dec 5 12:21:16 2008 @@ -143,6 +143,17 @@ void set_no_update_provide( int bflag ) { $self->noupdateprovide = bflag; } + int rule_count() { return $self->nrules; } + int rpmrules_start() { return 0; } + int rpmrules_end() { return $self->rpmrules_end; } + int featurerules_start() { return $self->featurerules; } + int featurerules_end() { return $self->featurerules_end; } + int updaterules_start() { return $self->updaterules; } + int updaterules_end() { return $self->updaterules_end; } + int jobrules_start() { return $self->jobrules; } + int jobrules_end() { return $self->jobrules_end; } + int learntrules_start() { return $self->learntrules; } + int learntrules_end() { return $self->nrules; } /************************** * Covenants @@ -274,6 +285,39 @@ { return solver_decisions_iterate( $self, solver_decisions_iterate_callback, NULL ); } #endif + /* + * explain a decision + * + * returns 4-element list [<SOLVER_PROBLEM_xxx>, Relation, Solvable, Solvable] + * + */ +#if defined(SWIGRUBY) + VALUE +#endif +#if defined(SWIGPYTHON) + PyObject * +#endif +#if defined(SWIGPERL) + SV * +#endif + explain(Transaction *t, Decision *decision) + { + Id depp = 0, sourcep = 0, targetp = 0; + SolverProbleminfo pi; + Swig_Type result = Swig_Array(); + if (decision->rule > 0) { + pi = solver_problemruleinfo($self, &(t->queue), decision->rule - $self->rules, &depp, &sourcep, &targetp); + Swig_Append(result, Swig_Int(pi)); + } + else { + Swig_Append(result, Swig_Int(-1)); + } + Swig_Append(result, SWIG_NewPointerObj((void*)relation_new($self->pool, depp), SWIGTYPE_p__Relation, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, sourcep), SWIGTYPE_p__Solvable, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, targetp), SWIGTYPE_p__Solvable, 0)); + return result; + } + #if defined(SWIGRUBY) %rename("problems?") problems_found(); %typemap(out) int problems_found -- 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] r11885 - /trunk/sat-solver/bindings/decision.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:20:19 2008 New Revision: 11885 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11885&view=rev Log: make Rule leading to decision accessible 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 Fri Dec 5 12:20:19 2008 @@ -36,5 +36,7 @@ { return xsolvable_new( $self->pool, $self->solvable ); } XSolvable *reason() { return xsolvable_new( $self->pool, $self->reason ); } + Rule *rule() + { return $self->rule; } } -- 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] r11884 - /trunk/sat-solver/bindings/problem.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:54 2008 New Revision: 11884 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11884&view=rev Log: extend SOLVER_PROBLEM constants Modified: trunk/sat-solver/bindings/problem.i Modified: trunk/sat-solver/bindings/problem.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/problem.i?re… ============================================================================== --- trunk/sat-solver/bindings/problem.i (original) +++ trunk/sat-solver/bindings/problem.i Fri Dec 5 12:19:54 2008 @@ -35,6 +35,8 @@ %constant int SOLVER_PROBLEM_PACKAGE_CONFLICT = SOLVER_PROBLEM_PACKAGE_CONFLICT; %constant int SOLVER_PROBLEM_PACKAGE_OBSOLETES = SOLVER_PROBLEM_PACKAGE_OBSOLETES; %constant int SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE = SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE; + %constant int SOLVER_PROBLEM_SELF_CONFLICT = SOLVER_PROBLEM_SELF_CONFLICT; + %constant int SOLVER_PROBLEM_RPM_RULE = SOLVER_PROBLEM_RPM_RULE; /* no constructor defined, Problems are created by accessing the Solver result. See 'Solver.each_problem'. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0