Author: mlschroe Date: Mon Oct 20 17:50:51 2008 New Revision: 11422 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11422&view=rev Log: - do not pass None as pool Modified: trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?rev=11422&r1=11421&r2=11422&view=diff ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Mon Oct 20 17:50:51 2008 @@ -76,19 +76,19 @@ || (s1->name != s2->name)) { n1 = id2str( $self->pool, s1->name ); - n2 = id2str( xs->pool, s2->name ); - i = strcmp( n1, n2 ); + n2 = id2str( xs->pool, s2->name ); + i = strcmp( n1, n2 ); } if (i == 0) /* names are equal */ { if ($self->pool == xs->pool) - i = evrcmp( $self->pool, s1->evr, s2->evr, EVRCMP_COMPARE ); - else - { + i = evrcmp( $self->pool, s1->evr, s2->evr, EVRCMP_COMPARE ); + else + { n1 = id2str( $self->pool, s1->evr ); - n2 = id2str( xs->pool, s2->evr ); - i = strcmp( n1, n2 ); - } + n2 = id2str( xs->pool, s2->evr ); + i = strcmp( n1, n2 ); + } } return i; } @@ -215,7 +215,7 @@ #if defined(SWIGPYTHON) %pythoncode %{ def attrs(self): - d = Dataiterator(None, self.repo(),"",SEARCH_NO_STORAGE_SOLVABLE,self) + d = Dataiterator(self.repo().pool(), self.repo(),"",SEARCH_NO_STORAGE_SOLVABLE,self) while d.step(): yield d.value() %} @@ -258,10 +258,10 @@ key = str2id( $self->pool, name, 0); if (key != ID_NULL) { Solvable *s = xsolvable_solvable($self); - Dataiterator di; - dataiterator_init(&di, s->repo->pool, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); - if (dataiterator_step(&di)) - result = Swig_True; + Dataiterator di; + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); + if (dataiterator_step(&di)) + result = Swig_True; } } #if defined(SWIGPYTHON) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org