Author: kkaempf Date: Mon Jan 21 17:53:39 2008 New Revision: 8337 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8337&view=rev Log: make solver flags really boolean for Ruby Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/ruby/tests/solutions.rb trunk/sat-solver/bindings/ruby/tests/solver.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/decisions.rb?rev=8337&r1=8336&r2=8337&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Mon Jan 21 17:53:39 2008 @@ -59,7 +59,7 @@ transaction.remove( "D" ) solver = pool.create_solver( installed ) - solver.allow_uninstall = 1; + solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) puts "** Problems found" if solver.problems? Modified: trunk/sat-solver/bindings/ruby/tests/solutions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/solutions.rb?rev=8337&r1=8336&r2=8337&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solutions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solutions.rb Mon Jan 21 17:53:39 2008 @@ -45,7 +45,7 @@ transaction.remove( "Z" ) solver = pool.create_solver( installed ) -# solver.allow_uninstall = 1; +# solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) assert solver.problems? Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/solver.rb?rev=8337&r1=8336&r2=8337&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Mon Jan 21 17:53:39 2008 @@ -19,7 +19,8 @@ transaction.remove( "xorg-x11" ) solver = SatSolver::Solver.new( pool, system ) - solver.allow_uninstall = 1 + solver.allow_uninstall = true + assert solver.allow_uninstall pool.prepare solver.solve( transaction ) solver.each_to_install { |s| Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?rev=8337&r1=8336&r2=8337&view=diff ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Mon Jan 21 17:53:39 2008 @@ -478,6 +478,11 @@ $1 = GetReadFile(fptr); rb_read_check($1) } + +/* boolean input argument */ +%typemap(in) (int bflag) { + $1 = RTEST( $input ); +} #endif //================================== @@ -1523,10 +1528,10 @@ int fix_system() { return $self->fixsystem; } #if defined(SWIGRUBY) - %rename( "fix_system=" ) set_fix_system( int i ); + %rename( "fix_system=" ) set_fix_system( int bflag ); #endif - void set_fix_system( int i ) - { $self->fixsystem = i; } + void set_fix_system( int bflag ) + { $self->fixsystem = bflag; } #if defined(SWIGRUBY) %typemap(out) int update_system @@ -1535,10 +1540,10 @@ int update_system() { return $self->updatesystem; } #if defined(SWIGRUBY) - %rename( "update_system=" ) set_update_system( int i ); + %rename( "update_system=" ) set_update_system( int bflag ); #endif - void set_update_system( int i ) - { $self->updatesystem = i; } + void set_update_system( int bflag ) + { $self->updatesystem = bflag; } #if defined(SWIGRUBY) %typemap(out) int allow_downgrade @@ -1547,10 +1552,10 @@ int allow_downgrade() { return $self->allowdowngrade; } #if defined(SWIGRUBY) - %rename( "allow_downgrade=" ) set_allow_downgrade( int i ); + %rename( "allow_downgrade=" ) set_allow_downgrade( int bflag ); #endif - void set_allow_downgrade( int i ) - { $self->allowdowngrade = i; } + void set_allow_downgrade( int bflag ) + { $self->allowdowngrade = bflag; } /* * On package removal, also remove dependant packages. @@ -1569,10 +1574,10 @@ int allow_uninstall() { return $self->allowuninstall; } #if defined(SWIGRUBY) - %rename( "allow_uninstall=" ) set_allow_uninstall( int i ); + %rename( "allow_uninstall=" ) set_allow_uninstall( int bflag ); #endif - void set_allow_uninstall( int i ) - { $self->allowuninstall = i; } + void set_allow_uninstall( int bflag ) + { $self->allowuninstall = bflag; } #if defined(SWIGRUBY) %typemap(out) int no_update_provide @@ -1581,10 +1586,10 @@ int no_update_provide() { return $self->noupdateprovide; } #if defined(SWIGRUBY) - %rename( "no_update_provide=" ) set_no_update_provide( int i ); + %rename( "no_update_provide=" ) set_no_update_provide( int bflag ); #endif - void set_no_update_provide( int i ) - { $self->noupdateprovide = i; } + void set_no_update_provide( int bflag ) + { $self->noupdateprovide = bflag; } /************************** -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org