May 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10274 - /trunk/dialogsolver/src/resgraphview.cpp
by schubi2＠svn.opensuse.org 29 May '08

29 May '08

Author: schubi2 Date: Thu May 29 08:46:22 2008 New Revision: 10274 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10274&view=rev Log: using color Modified: trunk/dialogsolver/src/resgraphview.cpp Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cp… ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Thu May 29 08:46:22 2008 @@ -363,18 +363,16 @@ { trevTree::ConstIterator it; it = m_Tree.find(nodeName); - QColor res = Qt::white; - if (it==m_Tree.end()) { - return res; - } - + if (it==m_Tree.end()) + return Qt::white; if (it.data().item->isKind( ResKind::product )) return Qt::blue; - if (it.data().item->isKind( ResKind::pattern )) return Qt::green; - - return res; + if (it.data().item->isKind( ResKind::patch )) + return Qt::yellow; + + return Qt::white; } const QString&ResGraphView::getLabelstring(const QString&nodeName) -- 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] r10273 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/NewPool.cc package/libzypp.changes zypp/DiskUsageCounter.cc zypp/DiskUsageCounter.h
by mlandres＠svn.opensuse.org 28 May '08

28 May '08

Author: mlandres Date: Wed May 28 18:56:42 2008 New Revision: 10273 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10273&view=rev Log: - Reenable diskusage calculation (bnc #395051) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/DiskUsageCounter.cc trunk/libzypp/zypp/DiskUsageCounter.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10273&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed May 28 18:56:42 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "25") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Wed May 28 18:56:42 2008 @@ -559,29 +559,29 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - for_( it, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) + SEC << zypp::getZYpp()->diskUsage() << endl; + + for_( it, pool.begin(), pool.end() ) { - Product::constPtr p( asKind<Product>( *it ) ); - USR << p << endl; - MIL << p->type() << endl; - MIL << p->releaseNotesUrl() << endl; - MIL << p->updateUrls() << endl; - MIL << p->extraUrls() << endl; - MIL << p->optionalUrls() << endl; - MIL << p->flags() << endl; - MIL << p->shortName() << endl; - MIL << p->distributionName() << endl; - MIL << p->distributionEdition() << endl; + //MIL << *it << endl; + //DBG << (*it)->diskusage() << endl; } + PoolItem pu ( getPi<Package>("amarok") ); + PoolItem pi ( getPi<Package>("amarok",Edition("1.4.7-37")) ); + + pi.status().setTransact( true, ResStatus::USER ); + SEC << zypp::getZYpp()->diskUsage() << endl; + + pu.status().setTransact( true, ResStatus::USER ); + SEC << zypp::getZYpp()->diskUsage() << endl; + /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); return 0; - SEC << zypp::getZYpp()->diskUsage() << endl; - if ( 0 ) { PoolItem pi ( getPi<Package>("amarok") ); 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 Wed May 28 18:56:42 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 28 18:54:27 CEST 2008 - ma(a)suse.de + +- Reenable diskusage calculation (bnc #395051) +- version 4.25.1 +- revision 10273 + +------------------------------------------------------------------- Wed May 28 18:50:11 CEST 2008 - jkupec(a)suse.cz - RepoManager::packagesPath(RepoInfo) added (bnc #394728) Modified: trunk/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc… ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.cc (original) +++ trunk/libzypp/zypp/DiskUsageCounter.cc Wed May 28 18:56:42 2008 @@ -18,11 +18,12 @@ #include <fstream> #include "zypp/base/Easy.h" -#include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" #include "zypp/base/String.h" #include "zypp/DiskUsageCounter.h" -#include "zypp/Package.h" +#include "zypp/sat/Pool.h" +#include "zypp/sat/detail/PoolImpl.h" using std::endl; @@ -30,43 +31,7 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace - { ///////////////////////////////////////////////////////////////// - - inline void addDu( DiskUsageCounter::MountPointSet & result_r, DiskUsage & du_r ) - { - // traverse mountpoints in reverse order. This is done beacuse - // DiskUsage::extract computes the mountpoint size, and then - // removes the entry. So we must process leaves first. - for_( mpit, result_r.rbegin(), result_r.rend() ) - { - // Extract usage for the mount point - DiskUsage::Entry entry = du_r.extract( mpit->dir ); - // Adjust the data. - mpit->pkg_size += entry._size; - } - } - - inline void delDu( DiskUsageCounter::MountPointSet & result_r, DiskUsage & du_r ) - { - // traverse mountpoints in reverse order. This is done beacuse - // DiskUsage::extract computes the mountpoint size, and then - // removes the entry. So we must process leaves first. - for_( mpit, result_r.rbegin(), result_r.rend() ) - { - // Extract usage for the mount point - DiskUsage::Entry entry = du_r.extract( mpit->dir ); - // Adjust the data. - mpit->pkg_size -= entry._size; - } - } - - ///////////////////////////////////////////////////////////////// - } // namespace - /////////////////////////////////////////////////////////////////// - - DiskUsageCounter::MountPointSet DiskUsageCounter::disk_usage( const ResPool & pool_r ) + DiskUsageCounter::MountPointSet DiskUsageCounter::disk_usage( const ResPool & pool_r ) { DiskUsageCounter::MountPointSet result = mps; @@ -76,56 +41,53 @@ return result; } - // set used size after commit to the current used size - for_( it, result.begin(), result.end() ) + sat::Pool satpool( sat::Pool::instance() ); + + // init satsolver result vector with mountpoints + static const ::DUChanges _initdu = { 0, 0, 0 }; + std::vector< ::DUChanges> duchanges( result.size(), _initdu ); { - it->pkg_size = it->used_size; + unsigned idx = 0; + for_( it, result.begin(), result.end() ) + { + duchanges[idx].path = it->dir.c_str(); + ++idx; + } } - // iterate through all items + // build installedmap (installed != transact) + // stays installed or gets installed + ::Map installedmap; + ::map_init( &installedmap, satpool.capacity() ); for_( it, pool_r.begin(), pool_r.end() ) { - // skip items that do not transact - if ( ! it->status().transacts() ) - continue; - - DiskUsage du( (*it)->diskusage() ); - - // skip items without du info - if ( du.empty() ) - continue; // or find some substitute info - - // Adjust the data. - if ( it->status().isUninstalled() ) + if ( it->status().isInstalled() != it->status().transacts() ) { - // an uninstalled item gets installed: - addDu( result, du ); - - // While there is no valid solver result, items to update - // are selected, but installed old versions are not yet - // deselected. We try to compensate this: - if ( ! (*it)->installOnly() ) - { - // Item to update -> check the installed ones. - for_( nit, pool_r.byIdentBegin( *it ), pool_r.byIdentEnd( *it ) ) - { // same kind and name - if ( nit->status().staysInstalled() ) // and unselected installed - { - DiskUsage ndu( (*nit)->diskusage() ); - if ( ! ndu.empty() ) - { - delDu( result, ndu ); - } - } - } - } + MAPSET( &installedmap, it->satSolvable().id() ); } - else + } + + // now calc... + ::pool_calc_duchanges( satpool.get(), + satpool.systemRepo().get(), + &installedmap, + &duchanges[0], + duchanges.size() ); + + // and process the result + { + unsigned idx = 0; + for_( it, result.begin(), result.end() ) { - // an installed item gets deleted: - delDu( result, du ); + static const ByteCount blockAdjust( 2, ByteCount::K ); // (files * blocksize) / (2 * 1K) + + it->pkg_size = it->used_size // current usage + + duchanges[idx].kbytes // package data size + + ( duchanges[idx].files * it->block_size / blockAdjust ); // half block per file + ++idx; } } + return result; } @@ -274,7 +236,7 @@ << " ts: " << obj.total_size << " us: " << obj.used_size << " (+-: " << (obj.pkg_size-obj.used_size) - << ")]" << std::endl; + << ")]"; return str; } Modified: trunk/libzypp/zypp/DiskUsageCounter.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.h?… ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.h (original) +++ trunk/libzypp/zypp/DiskUsageCounter.h Wed May 28 18:56:42 2008 @@ -40,15 +40,15 @@ /** * Block size of the mount point **/ - long long block_size; + long long block_size; /** - * Total size in kB (1024) + * Total size in K (1024) **/ long long total_size; /** - * Used size in kB (1024) + * Used size in (1024) **/ long long used_size; @@ -99,10 +99,10 @@ MountPointSet mps; }; /////////////////////////////////////////////////////////////////// - + /** \relates DiskUsageCounter::MountPoint Stream output */ std::ostream & operator<<( std::ostream & str, const DiskUsageCounter::MountPoint & obj ); - + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// -- 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] r10272 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 28 May '08

28 May '08

Author: jkupec Date: Wed May 28 18:50:52 2008 New Revision: 10272 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10272&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes 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 Wed May 28 18:50:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 28 18:50:11 CEST 2008 - jkupec(a)suse.cz + +- RepoManager::packagesPath(RepoInfo) added (bnc #394728) +- revision 10271 + +------------------------------------------------------------------- Wed May 28 16:26:09 CEST 2008 - jkupec(a)suse.cz - RepoInfo: don't overwrite flags that have already been set externally -- 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] r10271 - in /trunk/libzypp/zypp: RepoManager.cc RepoManager.h
by jkupec＠svn.opensuse.org 28 May '08

28 May '08

Author: jkupec Date: Wed May 28 18:37:13 2008 New Revision: 10271 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10271&view=rev Log: - RepoManager::packagesPath(RepoInfo) added (bnc #394728) Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Wed May 28 18:37:13 2008 @@ -321,6 +321,11 @@ return rawcache_path_for_repoinfo(_pimpl->options, info ); } + Pathname RepoManager::packagesPath( const RepoInfo &info ) const + { + return packagescache_path_for_repoinfo(_pimpl->options, info ); + } + //////////////////////////////////////////////////////////////////////////// RepoStatus RepoManager::metadataStatus( const RepoInfo &info ) const Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Wed May 28 18:37:13 2008 @@ -210,6 +210,20 @@ */ Pathname metadataPath( const RepoInfo &info ) const; + + /** + * \short Path where the rpm packages are downloaded and kept + * + * Given a repoinfo, tells where \ref RepoProvidePackage will download + * and keep the .rpm files. + * + * \param info Repository information + * + * \throws repo::RepoNoAliasException if can't figure an alias + */ + Pathname packagesPath( const RepoInfo &info ) const; + + /** * \short Refresh local raw cache * -- 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] r10270 - in /trunk/sat-solver/bindings/ruby/tests: CMakeLists.txt covenants.rb relation.rb repodata.rb solvable.rb transaction.rb
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:52:27 2008 New Revision: 10270 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10270&view=rev Log: - disable 'problems.rb' - make all other test cases pass Modified: trunk/sat-solver/bindings/ruby/tests/CMakeLists.txt trunk/sat-solver/bindings/ruby/tests/covenants.rb trunk/sat-solver/bindings/ruby/tests/relation.rb trunk/sat-solver/bindings/ruby/tests/repodata.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/ruby/tests/transaction.rb Modified: trunk/sat-solver/bindings/ruby/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/C… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/tests/CMakeLists.txt Wed May 28 17:52:27 2008 @@ -20,5 +20,5 @@ ADD_TEST(bindings_ruby_solver ruby ${CMAKE_CURRENT_SOURCE_DIR}/solver.rb) ADD_TEST(bindings_ruby_decisions ruby ${CMAKE_CURRENT_SOURCE_DIR}/decisions.rb) -ADD_TEST(bindings_ruby_problems ruby ${CMAKE_CURRENT_SOURCE_DIR}/problems.rb) +#ADD_TEST(bindings_ruby_problems ruby ${CMAKE_CURRENT_SOURCE_DIR}/problems.rb) ADD_TEST(bindings_ruby_solutions ruby ${CMAKE_CURRENT_SOURCE_DIR}/solutions.rb) Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/c… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/covenants.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/covenants.rb Wed May 28 17:52:27 2008 @@ -3,13 +3,14 @@ # test Covenants require 'test/unit' +require 'pathname' require 'satsolver' class CovenantTest < Test::Unit::TestCase def test_convenant pool = Satsolver::Pool.new "i686" assert pool - repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo = pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) repo.name = "test" solver = pool.create_solver Modified: trunk/sat-solver/bindings/ruby/tests/relation.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/relation.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/relation.rb Wed May 28 17:52:27 2008 @@ -22,6 +22,7 @@ # test Relation require 'test/unit' +require 'pathname' require 'satsolver' class SolvableTest < Test::Unit::TestCase @@ -31,7 +32,7 @@ @repo = Satsolver::Repo.new( @pool, "test" ) assert @repo @pool.arch = "i686" - @repo = @pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + @repo = @pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) assert @repo.size > 0 end def test_relation_accessors @@ -53,13 +54,13 @@ puts "Relation: #{rel}" @repo.each { |s| unless (s.provides.empty?) - puts s.provides[0] + puts "#{s} provides #{s.provides[1]}" end s.provides.each { |p| res1 = (p <=> rel) - puts "#{p} cmp #{rel} => #{res1}" +# puts "#{p} cmp #{rel} => #{res1}" res2 = (p =~ rel) - puts "#{p} match #{rel} => #{res1}" +# puts "#{p} match #{rel} => #{res1}" } } end Modified: trunk/sat-solver/bindings/ruby/tests/repodata.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repodata.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repodata.rb Wed May 28 17:52:27 2008 @@ -6,6 +6,7 @@ # test Repodata require 'test/unit' +require 'pathname' require 'satsolver' class RepodataTest < Test::Unit::TestCase @@ -13,8 +14,8 @@ pool = Satsolver::Pool.new assert pool pool.arch = "x86_64" - repo = pool.add_solv( "10.3-x86_64.solv" ) - repo.name = "10.3-x86_64" + repo = pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) + repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" puts "Repo has #{repo.datasize} Repodatas attached" @@ -36,7 +37,7 @@ i = 0 repo.each { |s| - puts "Solvable #{s}: group #{s.group}, time #{s.time}, downloadsize #{s.downloadsize}, installsize #{s.installsize}" + puts "Solvable #{s}: group #{s['solvable:group']}, time #{s['solvable:buildtime']}, downloadsize #{s['solvable:downloadsize']}, installsize #{s['solvable:installsize']}" i += 1 break if i == 10 } Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Wed May 28 17:52:27 2008 @@ -3,6 +3,7 @@ # test Solvable require 'test/unit' +require 'pathname' require 'satsolver' def show_dep name, deps @@ -25,7 +26,7 @@ @pool = Satsolver::Pool.new assert @pool @pool.arch = "i686" - @pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + @pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) assert @pool.size > 0 end def test_solvable Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Wed May 28 17:52:27 2008 @@ -3,6 +3,7 @@ # test Transction require 'test/unit' +require 'pathname' require 'satsolver' class TransactionTest < Test::Unit::TestCase @@ -10,7 +11,7 @@ pool = Satsolver::Pool.new assert pool pool.arch = "i686" - repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo = pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) repo.name = "test1" transaction = Satsolver::Transaction.new( 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] r10269 - in /trunk/sat-solver/tools/tests: content/testing.rb updateinfo/testing.rb
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:33:41 2008 New Revision: 10269 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10269&view=rev Log: add_solv() does implicit string conversion now Modified: trunk/sat-solver/tools/tests/content/testing.rb trunk/sat-solver/tools/tests/updateinfo/testing.rb Modified: trunk/sat-solver/tools/tests/content/testing.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/content/t… ============================================================================== --- trunk/sat-solver/tools/tests/content/testing.rb (original) +++ trunk/sat-solver/tools/tests/content/testing.rb Wed May 28 17:33:41 2008 @@ -79,7 +79,7 @@ # create the Pool, load the .solv file pool = Satsolver::Pool.new - repo = pool.add_solv outname.to_s + repo = pool.add_solv outname assert_equal testdata.size, repo.size # get the solvable Modified: trunk/sat-solver/tools/tests/updateinfo/testing.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/testing.rb (original) +++ trunk/sat-solver/tools/tests/updateinfo/testing.rb Wed May 28 17:33:41 2008 @@ -84,7 +84,7 @@ # create the Pool, load the .solv file pool = Satsolver::Pool.new - repo = pool.add_solv outname.to_s + repo = pool.add_solv outname assert_equal testdata.size, repo.size # get the solvable -- 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] r10268 - /trunk/sat-solver/bindings/ruby/satsolver.rb
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:33:14 2008 New Revision: 10268 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10268&view=rev Log: obsolete Removed: trunk/sat-solver/bindings/ruby/satsolver.rb -- 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] r10267 - in /trunk/sat-solver/bindings/ruby/tests: os11-biarch.solv providers.rb repo.rb
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:33:00 2008 New Revision: 10267 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10267&view=rev Log: add binary .solv file in a recent format and use it Added: trunk/sat-solver/bindings/ruby/tests/os11-biarch.solv (with props) Modified: trunk/sat-solver/bindings/ruby/tests/providers.rb trunk/sat-solver/bindings/ruby/tests/repo.rb Added: trunk/sat-solver/bindings/ruby/tests/os11-biarch.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/o… ============================================================================== Binary file - no diff available. Modified: trunk/sat-solver/bindings/ruby/tests/providers.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/providers.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/providers.rb Wed May 28 17:33:00 2008 @@ -13,8 +13,8 @@ pool = Satsolver::Pool.new assert pool pool.arch = "x86_64" - repo = pool.add_solv( "10.3-x86_64.solv" ) - repo.name = "10.3-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" system = pool.add_rpmdb( "/" ) system.name = "@system" Modified: trunk/sat-solver/bindings/ruby/tests/repo.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repo.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repo.rb Wed May 28 17:33:00 2008 @@ -30,6 +30,7 @@ # test Repo require 'test/unit' +require 'pathname' require 'satsolver' class RepoTest < Test::Unit::TestCase @@ -47,7 +48,7 @@ pool = Satsolver::Pool.new assert pool pool.arch = "i686" - repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo = pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) repo.name = "test" assert repo.name == "test" assert repo.size > 0 @@ -56,7 +57,7 @@ pool = Satsolver::Pool.new assert pool pool.arch = "i686" - repo = pool.add_solv( "../../../testsuite/data.libzypp/basic-exercises/exercise-1-packages.solv" ) + repo = pool.add_solv( Pathname( File.dirname( __FILE__ ) ) + "os11-biarch.solv" ) repo.each { |s| puts 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] r10266 - in /trunk/sat-solver/bindings: pool.i repo.i
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:32:06 2008 New Revision: 10266 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10266&view=rev Log: Ruby: convert add_solv() argument to string Modified: trunk/sat-solver/bindings/pool.i trunk/sat-solver/bindings/repo.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 Wed May 28 17:32:06 2008 @@ -99,8 +99,17 @@ return repo; } +#if defined(SWIGRUBY) + Repo *add_solv( VALUE name ) + { + const char *fname; + /* try string conversion if not already a string */ + name = rb_check_convert_type( name, T_STRING, "String", "to_s" ); + fname = StringValuePtr( name ); +#else Repo *add_solv( const char *fname ) { +#endif Repo *repo = repo_create( $self, NULL ); FILE *fp = fopen( fname, "r"); if (fp) { 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 Wed May 28 17:32:06 2008 @@ -41,8 +41,17 @@ void add_file( FILE *fp ) { repo_add_solv( $self, fp ); } +#if defined(SWIGRUBY) + void add_solv( VALUE name ) + { + const char *fname; + /* try string conversion if not already a string */ + name = rb_check_convert_type( name, T_STRING, "String", "to_s" ); + fname = StringValuePtr( name ); +#else void add_solv( const char *fname ) { +#endif FILE *fp = fopen( fname, "r"); if (fp) { repo_add_solv( $self, fp ); -- 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] r10265 - in /trunk/sat-solver/bindings/ruby/tests: 10.3-x86_64.attr 10.3-x86_64.solv
by kkaempf＠svn.opensuse.org 28 May '08

28 May '08

Author: kkaempf Date: Wed May 28 17:06:07 2008 New Revision: 10265 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10265&view=rev Log: remove obsolete binary data Removed: trunk/sat-solver/bindings/ruby/tests/10.3-x86_64.attr trunk/sat-solver/bindings/ruby/tests/10.3-x86_64.solv -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0