December 2008 - Zypp Commits - openSUSE Mailing Lists

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

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:08:06 2008 New Revision: 11863 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11863&view=rev Log: fix name() default string() to equal name() Modified: trunk/sat-solver/bindings/repokey.i Modified: trunk/sat-solver/bindings/repokey.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repokey.i?re… ============================================================================== --- trunk/sat-solver/bindings/repokey.i (original) +++ trunk/sat-solver/bindings/repokey.i Thu Dec 4 13:08:06 2008 @@ -35,7 +35,7 @@ const char *name() { Repokey *key = xrepokey_repokey( $self ); - return my_id2str( $self->repodata->repo->pool, key->name ); + return my_id2str( $self->repo->pool, key->name ); } /* type id of key */ int type_id() @@ -128,7 +128,8 @@ #endif const char *string() { - return "<Repokey>"; + Repokey *key = xrepokey_repokey( $self ); + return my_id2str( $self->repo->pool, key->name ); } } -- 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] r11862 - in /trunk/sat-solver/bindings: dependency.i transaction.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:06:53 2008 New Revision: 11862 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11862&view=rev Log: mixin Enumerable for Ruby Modified: trunk/sat-solver/bindings/dependency.i trunk/sat-solver/bindings/transaction.i Modified: trunk/sat-solver/bindings/dependency.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dependency.i… ============================================================================== --- trunk/sat-solver/bindings/dependency.i (original) +++ trunk/sat-solver/bindings/dependency.i Thu Dec 4 13:06:53 2008 @@ -25,6 +25,10 @@ typedef struct _Dependency {} Dependency; +#if defined(SWIGRUBY) +%mixin Dependency "Enumerable"; +#endif + %extend Dependency { %constant int DEP_PRV = DEP_PRV; %constant int DEP_REQ = DEP_REQ; Modified: trunk/sat-solver/bindings/transaction.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/transaction.… ============================================================================== --- trunk/sat-solver/bindings/transaction.i (original) +++ trunk/sat-solver/bindings/transaction.i Thu Dec 4 13:06:53 2008 @@ -25,6 +25,9 @@ %rename(Transaction) _Transaction; typedef struct _Transaction {} Transaction; +#if defined(SWIGRUBY) +%mixin Transaction "Enumerable"; +#endif %extend Transaction { Transaction( Pool *pool ) -- 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] r11861 - /trunk/sat-solver/bindings/repo.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:06:13 2008 New Revision: 11861 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11861&view=rev Log: mixin Enumerable for Ruby Modified: trunk/sat-solver/bindings/repo.i Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Thu Dec 4 13:06:13 2008 @@ -6,6 +6,9 @@ %rename(Repo) _Repo; typedef struct _Repo {} Repo; +#if defined(SWIGRUBY) +%mixin Repo "Enumerable"; +#endif %extend Repo { Repo( Pool *pool, const char *reponame ) -- 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] r11860 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:04:37 2008 New Revision: 11860 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11860&view=rev Log: Ruby enhancements - mixin Enumerable - pool.search() Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Thu Dec 4 13:04:37 2008 @@ -35,6 +35,10 @@ typedef struct _Pool {} Pool; %rename(Pool) _Pool; +#if defined(SWIGRUBY) +%mixin Pool "Enumerable"; +#endif + %extend Pool { /* @@ -364,6 +368,18 @@ %} #endif +#if defined(SWIGRUBY) + void search(const char *match, int flags, XSolvable *xs = NULL, const char *keyname = NULL) + { + Dataiterator *di; + di = swig_dataiterator_new($self, NULL, match, flags, xs, keyname); + while( dataiterator_step(di) ) { + rb_yield(SWIG_NewPointerObj((void*) di, SWIGTYPE_p__Dataiterator, 0)); + } + swig_dataiterator_free(di); + } +#endif + /************************** * Transaction management */ -- 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] r11859 - /trunk/sat-solver/applayer/dependency.c
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:03:48 2008 New Revision: 11859 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11859&view=rev Log: deal with accessing a single dep correctly Modified: trunk/sat-solver/applayer/dependency.c Modified: trunk/sat-solver/applayer/dependency.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/dependency.c… ============================================================================== --- trunk/sat-solver/applayer/dependency.c (original) +++ trunk/sat-solver/applayer/dependency.c Thu Dec 4 13:03:48 2008 @@ -58,17 +58,16 @@ int dependency_size( const Dependency *dep ) { - int i = 0; - Solvable *s; - Id *ids; Offset *relations = dependency_relations( dep ); if (relations) { - s = xsolvable_solvable( dep->xsolvable ); - ids = s->repo->idarraydata + *relations; + Solvable *s = xsolvable_solvable( dep->xsolvable ); + Id *ids = s->repo->idarraydata + *relations; + int i = 0; while (*ids++) ++i; + return i; } - return i; + return 0; } @@ -87,15 +86,17 @@ { Solvable *s = xsolvable_solvable( dep->xsolvable ); Offset *relations = dependency_relations( dep ); - /* loop over it to detect end */ - Id *ids = s->repo->idarraydata + *relations; - while ( i-- >= 0 ) { - if ( !*ids ) - break; - if ( i == 0 ) { - return relation_new( s->repo->pool, *ids ); + if (relations) { + /* loop over it to detect end */ + Id *ids = s->repo->idarraydata + *relations; + while ( i >= 0 ) { + if ( !*ids ) + break; + if ( i-- == 0 ) { + return relation_new( s->repo->pool, *ids ); + } + ++ids; } - ++ids; } return NULL; } -- 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] r11858 - in /trunk/libzypp: libzypp.spec.cmake package/libzypp.changes
by coolo＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: coolo Date: Thu Dec 4 11:11:05 2008 New Revision: 11858 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11858&view=rev Log: later products might finally install without warning Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=1… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Dec 4 11:11:05 2008 @@ -150,6 +150,7 @@ OLDLOCKSFILE=/etc/zypp/locks.old is_old(){ + test -f ${LOCKSFILE} || return 0 TEMP_FILE=`mktemp` cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE} if [ -s ${TEMP_FILE} ] 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 Thu Dec 4 11:11:05 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 4 11:10:35 CET 2008 - coolo(a)suse.de + +- fix %post script to not warn on fresh install + +------------------------------------------------------------------- Mon Dec 1 19:38:24 CET 2008 - ma(a)suse.de - Fix install order computation losing some installed 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] r11857 - /trunk/sat-solver/bindings/relation.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 10:52:41 2008 New Revision: 11857 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11857&view=rev Log: access relation operator as string 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 10:52:41 2008 @@ -65,6 +65,20 @@ return 0; } + const char *op_s() + { + static const char *ops[] = { + "", ">", "=", ">=", + "<", "<>", "<=", "<=>" + }; + int op = 0; + if (ISRELDEP( $self->id )) { + Reldep *rd = GETRELDEP( $self->pool, $self->id ); + op = rd->flags; + } + return ops[op % 8]; + } + #if defined(SWIGRUBY) %alias compare "<=>"; #endif -- 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] r11856 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 10:52:18 2008 New Revision: 11856 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11856&view=rev Log: rubyfy setting the 'installed' repo Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Thu Dec 4 10:52:18 2008 @@ -375,6 +375,9 @@ * Solver management */ +#if defined(SWIGRUBY) + %rename( "installed=" ) set_installed( Repo *repo ); +#endif void set_installed(Repo *installed = NULL) { pool_set_installed( $self, installed); -- 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] r11855 - /trunk/sat-solver/package/libsatsolver.spec.in
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 21:48:09 2008 New Revision: 11855 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11855&view=rev Log: allow SLE10 build Modified: trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Wed Dec 3 21:48:09 2008 @@ -18,7 +18,11 @@ BuildRequires: perl-devel %endif %if 0%{?suse_version} +%if 0%{?suse_version} < 1030 +BuildRequires: expat +%else BuildRequires: libexpat-devel +%endif %if 0%{?suse_version} < 1100 BuildRequires: graphviz %endif @@ -157,8 +161,13 @@ %files -n ruby-satsolver %defattr(-,root,root,-) %if 0%{?suse_version} +%if 0%{?suse_version} < 1100 +%dir %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch} +%{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}/satsolver.so +%else %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolver.so %endif +%endif %if 0%{?mandriva_version} %{ruby_sitearchdir}/satsolverx.so %endif -- 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] r11854 - /trunk/sat-solver/bindings/python/tests/providers.py
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 18:44:36 2008 New Revision: 11854 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11854&view=rev Log: testcase for Python 'providers' iterator Modified: trunk/sat-solver/bindings/python/tests/providers.py Modified: trunk/sat-solver/bindings/python/tests/providers.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/providers.py (original) +++ trunk/sat-solver/bindings/python/tests/providers.py Wed Dec 3 18:44:36 2008 @@ -2,36 +2,36 @@ # Check each_provider callback # -$:.unshift ".." +import unittest -# test EachProvider -require 'test/unit' -require 'satsolver' - -class EachProviderTest < Test::Unit::TestCase - def test_repo_create - pool = Satsolver::Pool.new +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + + +class TestSequenceFunctions(unittest.TestCase): + + def test_each_provider(self): + pool = satsolver.Pool() assert pool - pool.arch = "x86_64" - repo = pool.add_solv( "os11-biarch.solv" ) - repo.name = "openSUSE 11.0 Beta3 BiArch" - puts "Repo #{repo.name} loaded with #{repo.size} solvables" + pool.set_arch("x86_64") + repo = pool.add_solv( "../../testdata/os11-biarch.solv" ) + repo.set_name( "openSUSE 11.0 Beta3 BiArch" ) + print "Repo ", repo.name(), " loaded with ", repo.size(), " solvables" system = pool.add_rpmdb( "/" ) - system.name = "@system" - puts "Repo #{system.name} loaded with #{system.size} solvables" - - pool.prepare + system.set_name("@system") + print "Repo ", system.name(), " loaded with ", system.size(), " solvables" - puts "Providers of 'ispell_dictionary':" - pool.each_provider( "ispell_dictionary" ) { |s| - puts " #{s} [#{s.repo.name}]" - } - - rel = pool.create_relation( "ispell_english_dictionary", Satsolver::REL_GT, "3.3.02-23" ) + pool.prepare() + + i = 0 + for solv in pool.providers("ispell_dictionary"): + print solv, " provides ispell_dictionary" - puts "Providers of #{rel}:" - pool.each_provider(rel) { |s| - puts " #{s} [#{s.repo.name}]" - } - end -end + rel = pool.create_relation( "ispell_english_dictionary", satsolver.REL_GT, "3.3.02-23" ) + for solv in pool.providers(rel): + print solv, solv.repo().name() + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0