February 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : Improve reasoning (wip)
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit c959225690076d28d12856e0b972dc837e5694b4 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 13:31:41 2009 +0100 Improve reasoning (wip) --- bindings/ruby/tests/reasons.rb | 56 ++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 30 deletions(-) diff --git a/bindings/ruby/tests/reasons.rb b/bindings/ruby/tests/reasons.rb index 59ab802..5831841 100644 --- a/bindings/ruby/tests/reasons.rb +++ b/bindings/ruby/tests/reasons.rb @@ -18,6 +18,20 @@ module Satsolver "#{pool.solvable(id)}" end end + def to_relation pool, id + if (id < 0) + "!#{pool.relation(-id)}" + else + "#{pool.relation(id)}" + end + end + def to_providers pool, id + r = "<" + pool.each_provider(id) do |s| + r += "#{s}, " + end + r + ">" + end def to_s "p #{p}, d #{d}, w1 #{w1}, w2 #{w2}" end @@ -54,16 +68,16 @@ module Satsolver 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)}..." + "req! #{to_solvable(pool, -p)} requires one of #{to_providers(pool, d)}..." else - "upd! #{to_solvable(pool, d)} updates #{to_solvable(pool, p)}, provided by #{to_solvable(pool, w2)}..." + "upd! #{to_providers(pool, d)} updates #{to_solvable(pool, p)}, provided by #{to_solvable(pool, w2)}..." end else # d < 0 if p < 0 if d == -1 "del! #{to_solvable(pool, -p)}" else - "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + "cnf! #{to_solvable(pool, -p)} conflicts #{to_providers(pool, -d)}" end else "error p #{p}, d #{d}, w1 #{w1}, w2 {w2}" @@ -82,6 +96,7 @@ def explain solver, transaction puts "Remove #{s}" } solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_s if d.rule})" puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" e = solver.explain( transaction, d) if e.nil? @@ -129,18 +144,16 @@ class ReasonsTest < Test::Unit::TestCase @pool.arch = "i686" @repo = @pool.create_repo( 'test' ) end + + def test_direct_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 + solv2.requires << rel 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 ) @@ -148,23 +161,19 @@ class ReasonsTest < Test::Unit::TestCase @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - explain solver, transaction 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 + solv2.requires << 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 ) @@ -178,20 +187,15 @@ class ReasonsTest < Test::Unit::TestCase 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 + solv2.requires << 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 ) @@ -223,9 +227,7 @@ class ReasonsTest < Test::Unit::TestCase 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 @@ -249,17 +251,14 @@ class ReasonsTest < Test::Unit::TestCase 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" + puts "\n---\n#{solv2} obsoletes #{rel}, provided by installed #{solv1}" transaction = @pool.create_transaction transaction.install( solv2 ) @@ -273,16 +272,13 @@ class ReasonsTest < Test::Unit::TestCase 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 + solv2.requires << 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 -- 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] <sat-solver> master : Decision actions are bitmasks, not enums
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit 9c35e76c6d27062454b7592a45047e17fac211a3 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 13:30:54 2009 +0100 Decision actions are bitmasks, not enums --- applayer/decision.c | 5 +++++ applayer/decision.h | 14 +++++++------- bindings/decision.i | 11 +++++++---- bindings/ruby/tests/decisions.rb | 16 ++++++++-------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/applayer/decision.c b/applayer/decision.c index 7d6e48a..8b6511f 100644 --- a/applayer/decision.c +++ b/applayer/decision.c @@ -90,6 +90,11 @@ solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, vo op = DECISION_INSTALL; } } + if (why < 0) + { + op |= DECISION_FREE; + why = -why; + } d = decision_new( solver, op, s, solver->rules + why ); if (callback( d, user_data )) break; diff --git a/applayer/decision.h b/applayer/decision.h index 2df3320..76fa550 100644 --- a/applayer/decision.h +++ b/applayer/decision.h @@ -19,15 +19,15 @@ #include "solver.h" -enum decisions { - DECISION_INSTALL = 1, - DECISION_REMOVE, - DECISION_UPDATE, - DECISION_OBSOLETE -}; +#define DECISION_INSTALL 0x01 +#define DECISION_REMOVE 0x02 +#define DECISION_UPDATE 0x03 +#define DECISION_OBSOLETE 0x04 +#define DECISION_WEAK 0x10 +#define DECISION_FREE 0x20 typedef struct _Decision { - enum decisions op; + int op; Solver *solver; Id solvable; Rule *rule; diff --git a/bindings/decision.i b/bindings/decision.i index 52ac26e..b008795 100644 --- a/bindings/decision.i +++ b/bindings/decision.i @@ -8,10 +8,12 @@ typedef struct _Decision {} Decision; %extend Decision { - %constant int DEC_INSTALL = DECISION_INSTALL; - %constant int DEC_REMOVE = DECISION_REMOVE; - %constant int DEC_UPDATE = DECISION_UPDATE; - %constant int DEC_OBSOLETE = DECISION_OBSOLETE; + %constant int DECISION_INSTALL = DECISION_INSTALL; + %constant int DECISION_REMOVE = DECISION_REMOVE; + %constant int DECISION_UPDATE = DECISION_UPDATE; + %constant int DECISION_OBSOLETE = DECISION_OBSOLETE; + %constant int DECISION_WEAK = DECISION_WEAK; + %constant int DECISION_FREE = DECISION_FREE; /* no constructor defined, Decisions are created by accessing the Solver result. See 'Solver.each_decision'. */ @@ -28,6 +30,7 @@ typedef struct _Decision {} Decision; case DECISION_REMOVE: return "remove"; case DECISION_UPDATE: return "update"; case DECISION_OBSOLETE: return "obsolete"; + case DECISION_INSTALL|DECISION_FREE: return "free install"; default: break; } return "unknown"; diff --git a/bindings/ruby/tests/decisions.rb b/bindings/ruby/tests/decisions.rb index 18a30c6..793b648 100644 --- a/bindings/ruby/tests/decisions.rb +++ b/bindings/ruby/tests/decisions.rb @@ -70,14 +70,14 @@ class DecisionTest < Test::Unit::TestCase solver.each_decision { |d| i += 1 case d.op - when Satsolver::DEC_INSTALL - puts "#{i}: Install #{d.solvable} #{d.reason}" - when Satsolver::DEC_REMOVE - puts "#{i}: Remove #{d.solvable} #{d.reason}" - when Satsolver::DEC_OBSOLETE - puts "#{i}: Obsolete #{d.solvable} #{d.reason}" - when Satsolver::DEC_UPDATE - puts "#{i}: Update #{d.solvable} #{d.reason}" + when Satsolver::DECISION_INSTALL + puts "#{i}: Install #{d.solvable} #{d.rule}" + when Satsolver::DECISION_REMOVE + puts "#{i}: Remove #{d.solvable} #{d.rule}" + when Satsolver::DECISION_OBSOLETE + puts "#{i}: Obsolete #{d.solvable} #{d.rule}" + when Satsolver::DECISION_UPDATE + puts "#{i}: Update #{d.solvable} #{d.rule}" else puts "#{i}: Decision op #{d.op}" 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] <sat-solver> master : Fix test, run it during build
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit fee2d2170eabf99f3d9b7dcd770362db86aa9a96 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 13:29:28 2009 +0100 Fix test, run it during build --- bindings/ruby/tests/transaction.rb | 4 ++-- package/libsatsolver.spec.in | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bindings/ruby/tests/transaction.rb b/bindings/ruby/tests/transaction.rb index b2de649..454572f 100644 --- a/bindings/ruby/tests/transaction.rb +++ b/bindings/ruby/tests/transaction.rb @@ -18,10 +18,10 @@ class TransactionTest < Test::Unit::TestCase transaction = Satsolver::Transaction.new( pool ) assert transaction transaction.install( "foo" ) - transaction.install( repo[0] ) + transaction.install( repo.find "ruby" ) transaction.install( Satsolver::Relation.new( pool, "foo", Satsolver::REL_EQ, "42-7" ) ) transaction.remove( "bar" ) - transaction.remove( repo[1] ) + transaction.remove( repo.find "glibc" ) transaction.remove( Satsolver::Relation.new( pool, "bar", Satsolver::REL_EQ, "42-7" ) ) assert transaction.size == 6 transaction.each { |a| diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in index 2fe8e4b..1cc79a3 100644 --- a/package/libsatsolver.spec.in +++ b/package/libsatsolver.spec.in @@ -126,6 +126,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ make %{?jobs:-j %jobs} make doc_forced +%if 0%{?run_testsuite} + ctest . +%endif + %install make DESTDIR=$RPM_BUILD_ROOT install # we want to leave the .a file untouched -- 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] <sat-solver> master : Ignore generated files
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit cde60370a12d6cc58ab80694bd7a0a62503b86af Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 12:50:07 2009 +0100 Ignore generated files --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b65802f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*~ +build +tests/solver/data.libzypp/*/*.result \ No newline at end of file -- 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] <libzypp> master : make possible to run the testsuite from the spec file
by Duncan Mac-Vicar P 25 Feb '09

25 Feb '09

ref: refs/heads/master commit 9636d110cedfdcf2d969b277db84215b2098ed0e Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Feb 25 12:31:57 2009 +0100 make possible to run the testsuite from the spec file --- libzypp.spec.cmake | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index fe62a5d..9dcc7ef 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -119,6 +119,10 @@ make %{?jobs:-j %jobs} VERBOSE=1 make -C doc/autodoc %{?jobs:-j %jobs} make -C po %{?jobs:-j %jobs} translations +%if 0%{?run_testsuite} + ctest . +%endif + #make check %install -- 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] <libzypp> master : check that webserver is stopped before starting
by Duncan Mac-Vicar P 24 Feb '09

24 Feb '09

ref: refs/heads/master commit 94e90d7c4562080af149c21e534f1d5f10b0e271 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Feb 25 00:34:13 2009 +0100 check that webserver is stopped before starting --- tests/lib/WebServer.cc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tests/lib/WebServer.cc b/tests/lib/WebServer.cc index 030c6f0..4a215ed 100644 --- a/tests/lib/WebServer.cc +++ b/tests/lib/WebServer.cc @@ -160,6 +160,12 @@ public: virtual void start() { + if ( ! _stopped ) + { + MIL << "mongoose server already running, stopping." << endl; + stop(); + } + MIL << "Starting shttpd (mongoose)" << endl; _log.clear(); _ctx = mg_start(); -- 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] <zypper> master : changes
by Michael Andres 24 Feb '09

24 Feb '09

ref: refs/heads/master commit 171484e7c529ccab54e7798ca7ba7409fe1f7a87 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 24 16:39:06 2009 +0100 changes --- package/zypper.changes | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index e6d8b83..081c69d 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Feb 24 16:38:16 CET 2009 - ma(a)suse.de + +- Let 'zypper clean' keep the raw metadata cache of CD/DVD based + repositories. We'd need the CD/DVD again to recreate the data. + If this is actually desired, explicitly remove an recreate the + CD/DVD based repository. (bnc #476429). + +------------------------------------------------------------------- Sun Feb 15 21:43:13 CET 2009 - jkupec(a)suse.cz - Writing additional rpm output after installing/removing packages -- 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] <zypper> master : - Let 'zypper clean' keep the raw metadata cache of CD/DVD based
by Michael Andres 24 Feb '09

24 Feb '09

ref: refs/heads/master commit 5af4164f84b65cd148368cb3cfdb0e2182f85fe0 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 24 16:36:08 2009 +0100 - Let 'zypper clean' keep the raw metadata cache of CD/DVD based repositories. We'd need the CD/DVD again to recreate the data. If this is actually desired, explicitly remove an recreate the CD/DVD based repository. (bnc #476429). --- src/repos.cc | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/repos.cc b/src/repos.cc index aa9dabb..cdbc412 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -1157,10 +1157,20 @@ void clean_repos(Zypper & zypper) } if( clean_raw_metadata ) { - zypper.out().info(boost::str(format( - _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), - Out::HIGH); - manager.cleanMetadata(repo); + std::string scheme( repo.url().getScheme() ); + if ( ! ( scheme == "cd" || scheme == "dvd" ) ) + { + zypper.out().info(boost::str(format( + _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), + Out::HIGH); + manager.cleanMetadata(repo); + } + else + { + zypper.out().info(boost::str(format( + _("Keeping raw metadata cache for %s '%s'.")) %scheme %repo.alias ()), + Out::HIGH); + } } if( clean_packages ) { -- 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] <zypper> SuSE-Code-11-Branch : changes
by Michael Andres 24 Feb '09

24 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit adcfe6fecc38b9ac0d2372c1fdc5d3146427678f Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 24 16:36:17 2009 +0100 changes --- VERSION.cmake | 4 ++-- package/zypper.changes | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index dd81632..78ec581 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "7") +SET(VERSION_PATCH "8") -# LAST RELEASED: 1.0.7 +# LAST RELEASED: 1.0.8 #======= diff --git a/package/zypper.changes b/package/zypper.changes index d0b7f18..8f53bad 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Feb 24 16:29:04 CET 2009 - ma(a)suse.de + +- Let 'zypper clean' keep the raw metadata cache of CD/DVD based + repositories. We'd need the CD/DVD again to recreate the data. + If this is actually desired, explicitly remove an recreate the + CD/DVD based repository. (bnc #476429). +- 1.0.8 + +------------------------------------------------------------------- Sun Feb 15 21:58:35 CET 2009 - jkupec(a)suse.cz - Abort/Retry/Ingore prompt fixes (checking for EOF on input, -- 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] <zypper> SuSE-Code-11-Branch : - Let 'zypper clean' keep the raw metadata cache of CD/DVD based
by Michael Andres 24 Feb '09

24 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 679253f38fe89d834932b0ef85b6f421f9ebb3d7 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 24 16:36:08 2009 +0100 - Let 'zypper clean' keep the raw metadata cache of CD/DVD based repositories. We'd need the CD/DVD again to recreate the data. If this is actually desired, explicitly remove an recreate the CD/DVD based repository. (bnc #476429). --- src/repos.cc | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/repos.cc b/src/repos.cc index 518b2b3..7ac580b 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -1157,10 +1157,20 @@ void clean_repos(Zypper & zypper) } if( clean_raw_metadata ) { - zypper.out().info(boost::str(format( - _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), - Out::HIGH); - manager.cleanMetadata(repo); + std::string scheme( repo.url().getScheme() ); + if ( ! ( scheme == "cd" || scheme == "dvd" ) ) + { + zypper.out().info(boost::str(format( + _("Cleaning raw metadata cache for '%s'.")) % repo.alias ()), + Out::HIGH); + manager.cleanMetadata(repo); + } + else + { + zypper.out().info(boost::str(format( + _("Keeping raw metadata cache for %s '%s'.")) %scheme %repo.alias ()), + Out::HIGH); + } } if( clean_packages ) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0