June 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r5784 - in /trunk/zypper/src: zypper-command.cc zypper-command.h
by jkupec＠svn.opensuse.org 19 Jun '07

19 Jun '07

Author: jkupec Date: Tue Jun 19 12:17:01 2007 New Revision: 5784 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5784&view=rev Log: more commands added Modified: trunk/zypper/src/zypper-command.cc trunk/zypper/src/zypper-command.h Modified: trunk/zypper/src/zypper-command.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-command.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-command.cc (original) +++ trunk/zypper/src/zypper-command.cc Tue Jun 19 12:17:01 2007 @@ -25,6 +25,18 @@ const ZypperCommand ZypperCommand::REMOVE(ZypperCommand::REMOVE_e); const ZypperCommand ZypperCommand::UPDATE(ZypperCommand::UPDATE_e); +const ZypperCommand ZypperCommand::INFO(ZypperCommand::INFO_e); + +const ZypperCommand ZypperCommand::HELP(ZypperCommand::HELP_e); +const ZypperCommand ZypperCommand::SHELL(ZypperCommand::SHELL_e); +const ZypperCommand ZypperCommand::SHELL_QUIT(ZypperCommand::SHELL_QUIT_e); +const ZypperCommand ZypperCommand::NONE(ZypperCommand::NONE_e); +const ZypperCommand ZypperCommand::MOO(ZypperCommand::MOO_e); + + +const ZypperCommand ZypperCommand::RUG_PATCH_INFO(ZypperCommand::RUG_PATCH_INFO_e); + + ZypperCommand::ZypperCommand(const std::string & strval_r) : _command(parse(strval_r)) {} @@ -42,7 +54,18 @@ _table["install"] = _table["in"] = ZypperCommand::INSTALL_e; _table["remove"] = _table["rm"] = ZypperCommand::REMOVE_e; _table["update"] = _table["up"] = ZypperCommand::UPDATE_e; - _table["NONE"] = _table["none"] = ZypperCommand::NONE_e; + + _table["info"] = _table["if"] = ZypperCommand::INFO_e; + + _table["help"] = ZypperCommand::HELP_e; + _table["shell"] = _table["sh"] = ZypperCommand::SHELL_e; + _table["quit"] = _table["exit"] = _table["\004"] = ZypperCommand::SHELL_QUIT_e; + _table["NONE"] = _table["none"] = _table[""] = ZypperCommand::NONE_e; + _table["moo"] = ZypperCommand::MOO_e; + + + // rug commands doable with zypper commands + _table["patch-info"] = ZypperCommand::RUG_PATCH_INFO_e; } std::map<std::string,ZypperCommand::Command>::const_iterator it Modified: trunk/zypper/src/zypper-command.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-command.h?rev=… ============================================================================== --- trunk/zypper/src/zypper-command.h (original) +++ trunk/zypper/src/zypper-command.h Tue Jun 19 12:17:01 2007 @@ -10,6 +10,7 @@ */ struct ZypperCommand { + static const ZypperCommand NONE; static const ZypperCommand ADD_REPO; static const ZypperCommand REMOVE_REPO; static const ZypperCommand LIST_REPOS; @@ -18,6 +19,16 @@ static const ZypperCommand INSTALL; static const ZypperCommand REMOVE; static const ZypperCommand UPDATE; + + static const ZypperCommand INFO; + + static const ZypperCommand HELP; + static const ZypperCommand SHELL; + static const ZypperCommand SHELL_QUIT; + static const ZypperCommand MOO; + + // rug commands + static const ZypperCommand RUG_PATCH_INFO; enum Command { @@ -30,6 +41,15 @@ INSTALL_e, REMOVE_e, UPDATE_e, + + INFO_e, + + HELP_e, + SHELL_e, + SHELL_QUIT_e, + MOO_e, + + RUG_PATCH_INFO_e }; ZypperCommand(Command command) : _command(command) {} -- 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] r5783 - in /trunk/libzypp/zypp: RepoManager.cc RepoManager.h
by dmacvicar＠svn.opensuse.org 19 Jun '07

19 Jun '07

Author: dmacvicar Date: Tue Jun 19 11:05:05 2007 New Revision: 5783 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5783&view=rev Log: add repo by custom repoinfo or a complete remote .repo file implemented (not tested) 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 Tue Jun 19 11:05:05 2007 @@ -11,6 +11,7 @@ */ #include <iostream> +#include <fstream> #include <list> #include <algorithm> #include "zypp/base/InputStream.h" @@ -531,6 +532,36 @@ } //////////////////////////////////////////////////////////////////////////// + + /** + * Generate a non existing filename in a directory, using a base + * name. For example if a directory contains 3 files + * + * |-- bar + * |-- foo + * `-- moo + * + * If you try to generate a unique filename for this directory, + * based on "ruu" you will get "ruu", but if you use the base + * "foo" you will get "foo_1" + * + * \param dir Directory where the file needs to be unique + * \param basefilename string to base the filename on. + */ + static Pathname generate_non_existing_name( const Pathname &dir, + const std::string &basefilename ) + { + string final_filename = basefilename; + int counter = 1; + while ( PathInfo(dir + final_filename).isExist() ) + { + final_filename = basefilename + "_" + str::numstring(counter); + counter++; + } + return dir + Pathname(final_filename); + } + + //////////////////////////////////////////////////////////////////////////// void RepoManager::addRepository( const RepoInfo &info, const ProgressData::ReceiverFnc & progressrcv ) @@ -545,6 +576,18 @@ if ( info.alias() == (*it).alias() ) ZYPP_THROW(RepoAlreadyExistsException(info.alias())); } + + Pathname repofile = generate_non_existing_name(_pimpl->options.knownReposPath, info.alias()).extend(".repo"); + // now we have a filename that does not exists + MIL << "Saving repo in " << repofile << endl; + + std::ofstream file(repofile.c_str()); + if (!file) { + ZYPP_THROW (Exception( "Can't open " + repofile.asString() ) ); + } + + info.dumpRepoOn(file); + MIL << "done" << endl; } void RepoManager::addRepositories( const Url &url, @@ -566,21 +609,28 @@ } } - Pathname filename = Pathname(url.getPathName()).basename(); + string filename = Pathname(url.getPathName()).basename(); if ( filename == Pathname() ) ZYPP_THROW(RepoException("Invalid repo file name at " + url.asString() )); - // FIXME move this code to a separate function - Pathname final_filename = filename; - int counter = 1; - while ( PathInfo(_pimpl->options.knownReposPath + filename).isExist() ) - { - filename = Pathname( filename.asString() + "_" + str::numstring(counter)); - counter++; - } + Pathname repofile = generate_non_existing_name(_pimpl->options.knownReposPath, filename).extend(".repo"); // now we have a filename that does not exists + MIL << "Saving " << repos.size() << " repo" << ( repos.size() ? "s" : "" ) << " in " << repofile << endl; + std::ofstream file(repofile.c_str()); + if (!file) { + ZYPP_THROW (Exception( "Can't open " + repofile.asString() ) ); + } + + for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); + ++it ) + { + MIL << "Saving " << (*it).alias() << endl; + (*it).dumpRepoOn(file); + } + MIL << "done" << endl; } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Tue Jun 19 11:05:05 2007 @@ -206,18 +206,17 @@ * \throws ParseException If the file parsing fails * \throws Exception On other errors. */ - void addRepositories( const Url &url, + void addRepositories( const Url &url, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * PROPOSAL */ void removeRepository( const std::string & alias, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); - + + protected: RepoStatus rawMetadataStatus( const RepoInfo &info ); RepoStatus cacheStatus( const RepoInfo &info ); - - public: private: -- 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] r5782 - /trunk/zypper/src/zypper-callbacks.cc
by mvidner＠svn.opensuse.org 19 Jun '07

19 Jun '07

Author: mvidner Date: Tue Jun 19 10:46:23 2007 New Revision: 5782 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5782&view=rev Log: Fixed indentation (http://en.opensuse.org/Tab_Width) Modified: trunk/zypper/src/zypper-callbacks.cc Modified: trunk/zypper/src/zypper-callbacks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?r… ============================================================================== --- trunk/zypper/src/zypper-callbacks.cc (original) +++ trunk/zypper/src/zypper-callbacks.cc Tue Jun 19 10:46:23 2007 @@ -22,32 +22,32 @@ int read_action_ari (int default_action) { cout << _("(A)bort, (R)etry, (I)gnore?") << " "; // don't translate letters in parentheses!! - // non-interactive mode - if (gSettings.non_interactive) { - // abort if no default has been specified - if (default_action == -1) { - // print the answer for convenience - cout << 'a' << endl; - - return 0; - } - // return the specified default - else { - char c; - switch (default_action) { - case 0: c = 'a'; break; - case 1: c = 'r'; break; - case 2: c = 'i'; break; - default: c = '?'; - } - // print the answer for conveniecne - cout << c << endl; - - return default_action; - } - } + // non-interactive mode + if (gSettings.non_interactive) { + // abort if no default has been specified + if (default_action == -1) { + // print the answer for convenience + cout << 'a' << endl; + + return 0; + } + // return the specified default + else { + char c; + switch (default_action) { + case 0: c = 'a'; break; + case 1: c = 'r'; break; + case 2: c = 'i'; break; + default: c = '?'; + } + // print the answer for conveniecne + cout << c << endl; - // interactive mode, ask user + return default_action; + } + } + + // interactive mode, ask user while (true) { char c; cin >> c; -- 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] r5781 - /trunk/zypper/src/zypper-sources.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Tue Jun 19 01:01:18 2007 New Revision: 5781 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5781&view=rev Log: - Don't clean the cache, buildCache takes care of it. Modified: trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Tue Jun 19 01:01:18 2007 @@ -161,13 +161,7 @@ //<< "URI: " << it->url() << endl; manager.refreshMetadata(repo); - - if ( manager.isCached(repo ) ) - { - cout_v << _("Cleaning cache...") << endl; - manager.cleanCache(repo); - } - cout_v << _("Parsing repository metadata...") << endl; + cout_v << _("Creating repository cache...") << endl; manager.buildCache(repo); cout << _("DONE") << endl << endl; -- 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] r5780 - in /trunk/libzypp/zypp: RepoManager.cc RepoManager.h cache/CacheStore.cc cache/CacheStore.h
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Tue Jun 19 01:00:40 2007 New Revision: 5780 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5780&view=rev Log: - smart refresh works both for metadata and cache. Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/cache/CacheStore.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 Tue Jun 19 01:00:40 2007 @@ -257,6 +257,7 @@ { Pathname rawpath = rawcache_path_for_repoinfo( _pimpl->options, info ); RepoType repokind = info.type(); + RepoStatus status; switch ( repokind.toEnum() ) { case RepoType::NONE_e: @@ -271,27 +272,23 @@ { case RepoType::RPMMD_e : { - return RepoStatus( rawpath + "/repodata/repomd.xml"); + status = RepoStatus( rawpath + "/repodata/repomd.xml"); } break; case RepoType::YAST2_e : { - return RepoStatus( rawpath + "/content"); + status = RepoStatus( rawpath + "/content"); } break; default: ZYPP_THROW(RepoUnknownTypeException()); } - } - - RepoStatus RepoManager::cacheStatus( const RepoInfo &info ) - { - return RepoStatus(); + return status; } void RepoManager::refreshMetadata( const RepoInfo &info, - RepoRefreshPolicy policy, + RawMetadataRefreshPolicy policy, const ProgressData::ReceiverFnc & progress ) { assert_alias(info); @@ -405,22 +402,38 @@ void RepoManager::buildCache( const RepoInfo &info, CacheBuildPolicy policy, - const ProgressData::ReceiverFnc & progress ) + const ProgressData::ReceiverFnc & progressrcv ) { + ProgressData progress; + progress.sendTo(progressrcv); + progress.toMin(); assert_alias(info); Pathname rawpath = rawcache_path_for_repoinfo(_pimpl->options, info); cache::CacheStore store(_pimpl->options.repoCachePath); + RepoStatus raw_metadata_status = rawMetadataStatus(info); if ( store.isCached( info.alias() ) ) { - MIL << info.alias() << " is already cached, cleaning..." << endl; + MIL << info.alias() << " is already cached." << endl; data::RecordId id = store.lookupRepository(info.alias()); + RepoStatus cache_status = store.repositoryStatus(id); + + if ( cache_status.checksum() == raw_metadata_status.checksum() ) + { + MIL << info.alias() << " cache is up to date with metadata." << endl; + if ( policy == BuildIfNeeded ) { + progress.toMax(); + return; + } + else { + MIL << "Build cache is forced" << endl; + } + } store.cleanRepository(id); } data::RecordId id = store.lookupOrAppendRepository(info.alias()); - // do we have type? repo::RepoType repokind = info.type(); @@ -456,10 +469,11 @@ } // update timestamp and checksum - //store.updateRepository(id, ) + store.updateRepositoryStatus(id, raw_metadata_status); MIL << "Commit cache.." << endl; store.commit(); + progress.toMax(); } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Tue Jun 19 01:00:40 2007 @@ -74,7 +74,7 @@ /** Dtor */ ~RepoManager(); - enum RepoRefreshPolicy + enum RawMetadataRefreshPolicy { RefreshIfNeeded, RefreshForced @@ -114,7 +114,7 @@ * \throws Exception on unknown error. */ void refreshMetadata( const RepoInfo &info, - RepoRefreshPolicy policy = RefreshIfNeeded, + RawMetadataRefreshPolicy policy = RefreshIfNeeded, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Tue Jun 19 01:00:40 2007 @@ -57,8 +57,6 @@ insert_resolvable_in_repository_cmd.reset( new sqlite3_command( con, "insert into resolvables_repositories (resolvable_id, repository_id) values (:resolvable_id, :repository_id);" )); - update_repository_cmd.reset( new sqlite3_command( con, "update repositories set checksum=:checksum, timestamp=:timestamp where id=:repository_id;" )); - select_repository_cmd.reset( new sqlite3_command( con, "select id from repositories where alias=:alias;" )); insert_repository_cmd.reset( new sqlite3_command( con, "insert into repositories (alias,timestamp) values (:alias, :timestamp);" )); @@ -131,7 +129,6 @@ */ sqlite3_connection con; - sqlite3_command_ptr update_repository_cmd; sqlite3_command_ptr insert_resolvable_in_repository_cmd; sqlite3_command_ptr select_name_cmd; @@ -718,14 +715,21 @@ return id; } -void CacheStore::updateRepository( const RecordId &id, - const string &checksum, - const Date &timestamp ) -{ - _pimpl->update_repository_cmd->bind(":repository_id", id); - _pimpl->update_repository_cmd->bind(":checksum", checksum); - _pimpl->update_repository_cmd->bind(":timestamp", static_cast<int>((Date::ValueType) timestamp) ); - _pimpl->insert_repository_cmd->executenonquery(); +void CacheStore::updateRepositoryStatus( const RecordId &id, + const RepoStatus &status ) +{ + sqlite3_command cmd( _pimpl->con, "update repositories set checksum=:checksum, timestamp=:timestamp where id=:repository_id;"); + cmd.bind(":repository_id", id); + cmd.bind(":checksum", status.checksum()); + cmd.bind(":timestamp", static_cast<int>((Date::ValueType) status.timestamp()) ); + try + { + cmd.executenonquery(); + } + catch ( const sqlite3x::database_error &e ) + { + ZYPP_RETHROW(e); + } } RecordId CacheStore::lookupOrAppendRepository( const string &alias ) @@ -788,12 +792,14 @@ { status.setChecksum( reader.getstring(2) ); status.setTimestamp( reader.getstring(3) ); + return status; } - return status; + else + ZYPP_THROW(CacheRecordNotFoundException()); } catch ( const sqlite3x::database_error &e ) { - ZYPP_THROW(CacheRecordNotFoundException()); + ZYPP_RETHROW(e); } } Modified: trunk/libzypp/zypp/cache/CacheStore.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.h?… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.h (original) +++ trunk/libzypp/zypp/cache/CacheStore.h Tue Jun 19 01:00:40 2007 @@ -529,9 +529,8 @@ * * If the repository does not exists, nothing will happen */ - void updateRepository( const data::RecordId &id, - const std::string &checksum, - const Date &timestamp = Date::now() ); + void updateRepositoryStatus( const data::RecordId &id, + const RepoStatus &status ); /** * \short Clean repository from 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] r5779 - in /trunk/libzypp: ./ devel/devel.ma/ zypp/cache/ zypp/cache/schema/ zypp/cache/sqlite3x/ zypp/repo/ zypp/repo/yum/
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 23:57:39 2007 New Revision: 5779 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5779&view=rev Log: fix gcc-4.2 errors, warnings, add -D_FILE_OFFSET_BITS=64 and -O3 Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/devel/devel.ma/AOUT.cc trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/cache/schema/mkarray.c trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_command.cpp trunk/libzypp/zypp/repo/RepoType.cc trunk/libzypp/zypp/repo/yum/ResourceType.cc Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=5779&… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Mon Jun 18 23:57:39 2007 @@ -1,8 +1,5 @@ PROJECT(libzypp) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall " ) - # Library IF ( DEFINED LIB ) SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) @@ -30,7 +27,9 @@ SET( PACKAGE "libzypp" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) -ADD_DEFINITIONS( -g ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) +ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 ) ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) SET( LIBZYPP_VERSION_INFO "${LIBZYPP_SO_FIRST}.${LIBZYPP_AGE}.${LIBZYPP_PATCH}" ) Modified: trunk/libzypp/devel/devel.ma/AOUT.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/AOUT.cc?r… ============================================================================== --- trunk/libzypp/devel/devel.ma/AOUT.cc (original) +++ trunk/libzypp/devel/devel.ma/AOUT.cc Mon Jun 18 23:57:39 2007 @@ -1,86 +1,36 @@ -#if 0 -#include "Tools.h" +#include <iostream> +#include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" +#include "zypp/base/Function.h" +#include "zypp/base/IOStream.h" +#include "zypp/base/InputStream.h" +#include "zypp/ProgressData.h" -#include "zypp/base/Sysconfig.h" +#include "zypp/base/Random.h" + +#include <boost/thread.hpp> using std::endl; using namespace zypp; -namespace sysconfig = base::sysconfig; -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// - - -/****************************************************************** -** -** FUNCTION NAME : main -** FUNCTION TYPE : int -*/ + +void action( int i_r ) +{ + unsigned sec = base::random( 3 ); + sleep( sec ); + MIL << "Action " << i_r << " (" << sec << ")" << endl; +} + + int main( int argc, char * argv[] ) { - DBG << "===[START]==========================================" << endl; + INT << "===[START]==========================================" << endl; - Capability f( CapFactory().parse( Resolvable::Kind( "package" ), "filesystem(foo)" ) ); - Capability e( CapFactory().filesystemEvalCap() ); + for ( unsigned i = 0; i < 5; ++i ) + { + new boost::thread( bind( action, i ) ); + } - MIL << f << endl; - MIL << e << endl; - MIL << f.matches( e ) << endl; - MIL << e.matches( f ) << endl; - - DBG << "===[END]============================================" << endl; - zypp::base::LogControl::instance().logNothing(); - return 0; + INT << "===[END]============================================" << endl << endl; + return ( 0 ); } -#endif - - #include <iostream> - #include "zypp/base/Logger.h" - #include "zypp/base/IOStream.h" - #include "zypp/base/InputStream.h" - #include "zypp/ProgressData.h" - - using namespace zypp; - - // Defined in ProgressData.h: - // Initialize ProgressData from an InputStream. - // - // ProgressData makeProgressData( const InputStream & input_r ) - // { - // ProgressData ret; - // ret.name( input_r.name() ); - // if ( input_r.size() > 0 ) - // ret.range( input_r.size() ); - // return ret; - // } - - void simpleParser( const InputStream & input_r, - const ProgressData::ReceiverFnc & fnc_r = ProgressData::ReceiverFnc() ) - { - ProgressData ticks( makeProgressData( input_r ) ); - ticks.sendTo( fnc_r ); - ticks.toMin(); // start sending min (0) - - iostr::EachLine line( input_r ); - for( ; line; line.next() ) - { - /* process the line */ - - if ( ! ticks.set( input_r.stream().tellg() ) ) - return; // user requested abort - } - - ticks.toMax(); // take care 100% are reported on success - } - - int main( int argc, char * argv[] ) - { - simpleParser( "packages" ); - simpleParser( "packages.gz" ); - return ( 0 ); - } Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Mon Jun 18 23:57:39 2007 @@ -399,6 +399,7 @@ //! \todo maybe appendChangelog(const data::RecordId & resolvable_id, Changelog changelog) will be needed //! for inserting the changelog using in-memory record id of corresponding resolvable. //! (first, we'll see how fast is the inserting without remembering those ids) + return data::noRecordId; } RecordId CacheStore::consumeFilelist( const data::RecordId & repository_id, @@ -406,6 +407,7 @@ const data::Filenames & filenames ) { //! \todo maybe consumeFilelist(const data::RecordId & resolvable_id, data::Filenames &) will be needed + return data::noRecordId; } RecordId CacheStore::appendResolvable( const RecordId &repository_id, Modified: trunk/libzypp/zypp/cache/schema/mkarray.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/schema/mkarra… ============================================================================== --- trunk/libzypp/zypp/cache/schema/mkarray.c (original) +++ trunk/libzypp/zypp/cache/schema/mkarray.c Mon Jun 18 23:57:39 2007 @@ -15,7 +15,7 @@ #include <stdlib.h> #include <string.h> -static +static int mkarray(filename, file, ofile, varname) char *filename; FILE *file; @@ -23,7 +23,7 @@ char *varname; { char buf[BUFSIZ]; - size_t i, rsize, tsize=0; + size_t rsize, tsize=0; int done=0, line=8, status=EXIT_SUCCESS; fprintf(ofile, "/*\n"); @@ -71,7 +71,7 @@ if(8!=line) fputc('\n', ofile); fputs("};\n\n", ofile); - fprintf(ofile, "size_t _%s_size=%d;\n", varname, tsize); + fprintf(ofile, "size_t _%s_size=%d;\n", varname, (int)tsize); fprintf(ofile, "size_t *%s_size=&_%s_size;\n", varname, varname); if(ferror(ofile)) { @@ -86,11 +86,11 @@ return status; } +int main(argc, argv) char *argv[]; { char *filename, *ofilename, *varname; - FILE *file; int status=EXIT_SUCCESS; --argc; Modified: trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_command.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/sqlite3x/sqli… ============================================================================== --- trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_command.cpp (original) +++ trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_command.cpp Mon Jun 18 23:57:39 2007 @@ -41,7 +41,8 @@ sqlite3_command::sqlite3_command(sqlite3_connection &con, const wchar_t *sql) : con(con),refs(0) { const wchar_t *tail=NULL; - if (sqlite3_prepare16(con.db, sql, -1, &this->stmt, (const void**)&tail)!=SQLITE_OK) + const wchar_t **tmpptr=&tail; + if (sqlite3_prepare16(con.db, sql, -1, &this->stmt, (const void**)tmpptr)!=SQLITE_OK) SQLITE3X_THROW(database_error(con)); this->argc=sqlite3_column_count(this->stmt); @@ -59,7 +60,8 @@ sqlite3_command::sqlite3_command(sqlite3_connection &con, const std::wstring &sql) : con(con),refs(0) { const wchar_t *tail=NULL; - if (sqlite3_prepare16(con.db, sql.data(), (int)sql.length()*2, &this->stmt, (const void**)&tail)!=SQLITE_OK) + const wchar_t **tmpptr=&tail; + if (sqlite3_prepare16(con.db, sql.data(), (int)sql.length()*2, &this->stmt, (const void**)tmpptr)!=SQLITE_OK) SQLITE3X_THROW(database_error(con)); this->argc=sqlite3_column_count(this->stmt); Modified: trunk/libzypp/zypp/repo/RepoType.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoType.cc?re… ============================================================================== --- trunk/libzypp/zypp/repo/RepoType.cc (original) +++ trunk/libzypp/zypp/repo/RepoType.cc Mon Jun 18 23:57:39 2007 @@ -7,6 +7,7 @@ | | \---------------------------------------------------------------------*/ +#include <iostream> #include <map> #include "zypp/base/Exception.h" #include "RepoType.h" Modified: trunk/libzypp/zypp/repo/yum/ResourceType.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/ResourceTy… ============================================================================== --- trunk/libzypp/zypp/repo/yum/ResourceType.cc (original) +++ trunk/libzypp/zypp/repo/yum/ResourceType.cc Mon Jun 18 23:57:39 2007 @@ -7,6 +7,7 @@ | | \---------------------------------------------------------------------*/ +#include <iostream> #include <map> #include "zypp/base/Exception.h" #include "ResourceType.h" -- 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] r5778 - /trunk/libzypp/zypp/source/SourceImpl.cc
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 23:26:58 2007 New Revision: 5778 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5778&view=rev Log: typo2 Modified: trunk/libzypp/zypp/source/SourceImpl.cc Modified: trunk/libzypp/zypp/source/SourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/SourceImpl.c… ============================================================================== --- trunk/libzypp/zypp/source/SourceImpl.cc (original) +++ trunk/libzypp/zypp/source/SourceImpl.cc Mon Jun 18 23:26:58 2007 @@ -229,7 +229,7 @@ std::string SourceImpl::checksum() const { - return base::randomString(48); + return base::random_string(48); } void SourceImpl::dirInfo(const unsigned media_nr, -- 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] r5777 - /trunk/libzypp/zypp/RepoManager.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 23:17:58 2007 New Revision: 5777 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5777&view=rev Log: dont empty the dir if the dir does not need refresh Modified: trunk/libzypp/zypp/RepoManager.cc 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 Mon Jun 18 23:17:58 2007 @@ -345,7 +345,8 @@ if ( refresh ) downloader.download(tmpdir.path()); - + else + return; // no error } break; @@ -371,6 +372,8 @@ if ( refresh ) downloader.download(tmpdir.path()); + else + return; // no error } break; -- 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] r5776 - in /trunk/libzypp/zypp: RepoManager.cc RepoStatus.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 23:12:35 2007 New Revision: 5776 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5776&view=rev Log: - fix segfault in RepoStatus (yeah I forgot to new the Impl class in one of the constructors :-P ) - Fix refresh, now it is smart :-) Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoStatus.cc 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 Mon Jun 18 23:12:35 2007 @@ -338,7 +338,11 @@ refresh = true; } } - + else + { + refresh = true; + } + if ( refresh ) downloader.download(tmpdir.path()); @@ -360,7 +364,11 @@ refresh = true; } } - + else + { + refresh = true; + } + if ( refresh ) downloader.download(tmpdir.path()); // no error Modified: trunk/libzypp/zypp/RepoStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.cc?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.cc (original) +++ trunk/libzypp/zypp/RepoStatus.cc Mon Jun 18 23:12:35 2007 @@ -66,7 +66,7 @@ // METHOD TYPE : Ctor // RepoStatus::RepoStatus() - : _pimpl( new Impl() ) + : _pimpl( new Impl() ) {} /////////////////////////////////////////////////////////////////// @@ -78,6 +78,7 @@ {} RepoStatus::RepoStatus( const Pathname &path ) + : _pimpl( new Impl() ) { _pimpl->checksum = filesystem::sha1sum(path); } -- 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] r5775 - /trunk/libzypp/zypp/source/SourceImpl.cc
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 23:07:47 2007 New Revision: 5775 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5775&view=rev Log: typo Modified: trunk/libzypp/zypp/source/SourceImpl.cc Modified: trunk/libzypp/zypp/source/SourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/SourceImpl.c… ============================================================================== --- trunk/libzypp/zypp/source/SourceImpl.cc (original) +++ trunk/libzypp/zypp/source/SourceImpl.cc Mon Jun 18 23:07:47 2007 @@ -229,7 +229,7 @@ std::string SourceImpl::checksum() const { - return randomString(48); + return base::randomString(48); } void SourceImpl::dirInfo(const unsigned media_nr, -- 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] r5774 - in /trunk/libzypp/zypp: base/Random.cc base/Random.h source/SourceImpl.cc
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 22:55:26 2007 New Revision: 5774 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5774&view=rev Log: enhanced base/Random.h; duplicate code removed Modified: trunk/libzypp/zypp/base/Random.cc trunk/libzypp/zypp/base/Random.h trunk/libzypp/zypp/source/SourceImpl.cc Modified: trunk/libzypp/zypp/base/Random.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Random.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/base/Random.cc (original) +++ trunk/libzypp/zypp/base/Random.cc Mon Jun 18 22:55:26 2007 @@ -39,7 +39,7 @@ int i = 0; while (length--) { - int r=random() % 62; + int r=::random() % 62; r+=48; if (r>57) r+=7; if (r>90) r+=6; @@ -48,7 +48,7 @@ } return str; } - - + + } } Modified: trunk/libzypp/zypp/base/Random.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Random.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/base/Random.h (original) +++ trunk/libzypp/zypp/base/Random.h Mon Jun 18 22:55:26 2007 @@ -23,6 +23,24 @@ // Taken from KApplication std::string random_string(int length); + + /** Return a random number from <tt>[0,RAND_MAX[</tt>. */ + inline unsigned random() + { + return random_int(); + } + /** Return a random number from <tt>[0,size_r[</tt>. */ + inline unsigned random( unsigned size_r ) + { + return random_int() % size_r; + } + /** Return a random number from <tt>[min_r,min_r+size_r[</tt>. */ + inline unsigned random( unsigned min_r, unsigned size_r ) + { + return min_r + random( size_r ); + } + + } //ns base } // ns zypp Modified: trunk/libzypp/zypp/source/SourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/SourceImpl.c… ============================================================================== --- trunk/libzypp/zypp/source/SourceImpl.cc (original) +++ trunk/libzypp/zypp/source/SourceImpl.cc Mon Jun 18 22:55:26 2007 @@ -13,6 +13,7 @@ #include <fstream> #include "zypp/base/Logger.h" #include "zypp/base/Gettext.h" +#include "zypp/base/Random.h" #include "zypp/Digest.h" #include "zypp/SourceFactory.h" #include "zypp/source/SourceImpl.h" @@ -32,48 +33,6 @@ IMPL_PTR_TYPE(SourceImpl); -// Taken from KApplication -static int random() -{ - static bool init = false; - if (!init) - { - unsigned int seed; - init = true; - int fd = open("/dev/urandom", O_RDONLY); - if (fd < 0 || ::read(fd, &seed, sizeof(seed)) != sizeof(seed)) - { - // No /dev/urandom... try something else. - srand(getpid()); - seed = rand()+time(0); - } - if (fd >= 0) close(fd); - srand(seed); - } - return rand(); -} - -// Taken from KApplication -static std::string randomString(int length) -{ - if (length <=0 ) return std::string(); - - std::string str; - str.resize( length ); - int i = 0; - while (length--) - { - int r=random() % 62; - r+=48; - if (r>57) r+=7; - if (r>90) r+=6; - str[i++] = char(r); - // so what if I work backwards? - } - return str; -} - - class DownloadProgressPackageReceiver : public callback::ReceiveReport<media::DownloadProgressReport> { callback::SendReport <DownloadResolvableReport> & _report; -- 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] r5773 - in /trunk/libzypp/zypp: Arch.cc DiskUsageCounter.cc VendorAttr.cc target/rpm/librpmDb.cv3.cc target/store/XMLFilesBackend.cc
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 21:51:08 2007 New Revision: 5773 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5773&view=rev Log: char* vs. const char* fixes Modified: trunk/libzypp/zypp/Arch.cc trunk/libzypp/zypp/DiskUsageCounter.cc trunk/libzypp/zypp/VendorAttr.cc trunk/libzypp/zypp/target/rpm/librpmDb.cv3.cc trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=5773&r1… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Mon Jun 18 21:51:08 2007 @@ -289,7 +289,7 @@ static const string canonical_arch (const string & arch) { - typedef struct { char *from; char *to; } canonical; + struct canonical { const char *from; const char *to; }; // convert machine string to known_arch static canonical canonical_archs[] = { { "noarch", "noarch" }, 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 Mon Jun 18 21:51:08 2007 @@ -245,13 +245,13 @@ // // Filter some common unwanted mountpoints // - char * mpunwanted[] = { + const char * mpunwanted[] = { "/mnt", "/media", "/mounts", "/floppy", "/cdrom", "/suse", "/var/tmp", "/var/adm/mount", "/var/adm/YaST", /*last*/0/*entry*/ }; - char ** nomp = mpunwanted; + const char ** nomp = mpunwanted; for ( ; *nomp; ++nomp ) { std::string pre( *nomp ); if ( mp.compare( 0, pre.size(), pre ) == 0 // mp has prefix pre Modified: trunk/libzypp/zypp/VendorAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.cc?rev=5… ============================================================================== --- trunk/libzypp/zypp/VendorAttr.cc (original) +++ trunk/libzypp/zypp/VendorAttr.cc Mon Jun 18 21:51:08 2007 @@ -94,7 +94,7 @@ VendorAttr::VendorAttr () { - char * vendors[] = { + const char * vendors[] = { "jpackage project", "novell", "opensuse", @@ -104,7 +104,7 @@ "ati technologies inc.", "nvidia" }; - _trustedVendors.insert( vendors, vendors+(sizeof(vendors)/sizeof(char *)) ); + _trustedVendors.insert( vendors, vendors+(sizeof(vendors)/sizeof(const char *)) ); Pathname vendorrcPath( getZYpp()->homePath() / "db/trustedVendors" ); try Modified: trunk/libzypp/zypp/target/rpm/librpmDb.cv3.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/librpmDb… ============================================================================== --- trunk/libzypp/zypp/target/rpm/librpmDb.cv3.cc (original) +++ trunk/libzypp/zypp/target/rpm/librpmDb.cv3.cc Mon Jun 18 21:51:08 2007 @@ -307,7 +307,7 @@ providesEVR = (const char **)hgePtr; for (i = 0; i < providesCount; i++) { - char * vdummy = ""; + const char * vdummy = ""; int_32 fdummy = RPMSENSE_ANY; xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION, RPM_STRING_ARRAY_TYPE, &vdummy, 1); Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFil… ============================================================================== --- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Mon Jun 18 21:51:08 2007 @@ -85,13 +85,13 @@ * see: https://bugzilla.novell.com/show_bug.cgi?id=205392 */ -typedef struct +struct PRODUCT_TABLE_ENTRY { - char * dist_name; - char * dist_version; - char * product_name; - char * product_version; -} PRODUCT_TABLE_ENTRY; + const char * dist_name; + const char * dist_version; + const char * product_name; + const char * product_version; +}; /** * create the map on demand so we -- 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] r5772 - in /trunk/libzypp/zypp: ./ cache/ parser/ repo/susetags/ repo/yum/
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 18:05:43 2007 New Revision: 5772 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5772&view=rev Log: backup implementing smart refresh, addding and deletion of repos Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/RepoStatus.cc trunk/libzypp/zypp/RepoStatus.h trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/parser/IniDict.cc trunk/libzypp/zypp/parser/IniDict.h trunk/libzypp/zypp/parser/RepoFileReader.cc trunk/libzypp/zypp/repo/susetags/Downloader.cc trunk/libzypp/zypp/repo/susetags/Downloader.h trunk/libzypp/zypp/repo/yum/Downloader.cc trunk/libzypp/zypp/repo/yum/Downloader.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 Mon Jun 18 18:05:43 2007 @@ -253,12 +253,52 @@ //////////////////////////////////////////////////////////////////////////// + RepoStatus RepoManager::rawMetadataStatus( const RepoInfo &info ) + { + Pathname rawpath = rawcache_path_for_repoinfo( _pimpl->options, info ); + RepoType repokind = info.type(); + switch ( repokind.toEnum() ) + { + case RepoType::NONE_e: + // unknown, probe the local metadata + repokind = probe(Url(rawpath.asString())); + break; + default: + break; + } + + switch ( repokind.toEnum() ) + { + case RepoType::RPMMD_e : + { + return RepoStatus( rawpath + "/repodata/repomd.xml"); + } + break; + case RepoType::YAST2_e : + { + return RepoStatus( rawpath + "/content"); + } + break; + default: + ZYPP_THROW(RepoUnknownTypeException()); + } + } + + RepoStatus RepoManager::cacheStatus( const RepoInfo &info ) + { + return RepoStatus(); + } + + void RepoManager::refreshMetadata( const RepoInfo &info, + RepoRefreshPolicy policy, const ProgressData::ReceiverFnc & progress ) { assert_alias(info); assert_urls(info); + RepoStatus oldstatus; + RepoStatus newstatus; // try urls one by one for ( RepoInfo::urls_const_iterator it = info.baseUrlsBegin(); it != info.baseUrlsEnd(); ++it ) { @@ -278,19 +318,51 @@ break; } + Pathname rawpath = rawcache_path_for_repoinfo( _pimpl->options, info ); + oldstatus = rawMetadataStatus(info); + switch ( repokind.toEnum() ) { case RepoType::RPMMD_e : { yum::Downloader downloader( url, "/" ); - downloader.download(tmpdir.path()); + + RepoStatus newstatus = downloader.status(); + bool refresh = false; + if ( oldstatus.checksum() == newstatus.checksum() ) + { + MIL << "repo has not changed" << endl; + if ( policy == RefreshForced ) + { + MIL << "refresh set to forced" << endl; + refresh = true; + } + } + + if ( refresh ) + downloader.download(tmpdir.path()); + // no error } break; case RepoType::YAST2_e : { susetags::Downloader downloader( url, "/" ); - downloader.download(tmpdir.path()); + + RepoStatus newstatus = downloader.status(); + bool refresh = false; + if ( oldstatus.checksum() == newstatus.checksum() ) + { + MIL << "repo has not changed" << endl; + if ( policy == RefreshForced ) + { + MIL << "refresh set to forced" << endl; + refresh = true; + } + } + + if ( refresh ) + downloader.download(tmpdir.path()); // no error } break; @@ -300,7 +372,6 @@ // ok we have the metadata, now exchange // the contents - Pathname rawpath = rawcache_path_for_repoinfo(_pimpl->options, info); TmpDir oldmetadata; filesystem::assert_dir(rawpath); filesystem::rename( rawpath, oldmetadata.path() ); @@ -322,6 +393,7 @@ //////////////////////////////////////////////////////////////////////////// void RepoManager::buildCache( const RepoInfo &info, + CacheBuildPolicy policy, const ProgressData::ReceiverFnc & progress ) { assert_alias(info); @@ -372,6 +444,9 @@ ZYPP_THROW(RepoUnknownTypeException()); } + // update timestamp and checksum + //store.updateRepository(id, ) + MIL << "Commit cache.." << endl; store.commit(); } @@ -476,8 +551,11 @@ int counter = 1; while ( PathInfo(_pimpl->options.knownReposPath + filename).isExist() ) { - filename = Pathname( filename.asString() ); + filename = Pathname( filename.asString() + "_" + str::numstring(counter)); + counter++; } + // now we have a filename that does not exists + } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Mon Jun 18 18:05:43 2007 @@ -24,6 +24,7 @@ #include "zypp/RepoInfo.h" #include "zypp/repo/RepoException.h" #include "zypp/repo/RepoType.h" +#include "zypp/RepoStatus.h" #include "zypp/ProgressData.h" /////////////////////////////////////////////////////////////////// @@ -75,10 +76,16 @@ enum RepoRefreshPolicy { - RefreshIfChanged, + RefreshIfNeeded, RefreshForced }; + enum CacheBuildPolicy + { + BuildIfNeeded, + BuildForced + }; + enum RepoAddPolicy { }; @@ -107,6 +114,7 @@ * \throws Exception on unknown error. */ void refreshMetadata( const RepoInfo &info, + RepoRefreshPolicy policy = RefreshIfNeeded, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** @@ -134,6 +142,7 @@ * \throws Exception on unknown error. */ void buildCache( const RepoInfo &info, + CacheBuildPolicy policy = BuildIfNeeded, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** @@ -205,6 +214,10 @@ void removeRepository( const std::string & alias, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); + RepoStatus rawMetadataStatus( const RepoInfo &info ); + RepoStatus cacheStatus( const RepoInfo &info ); + + public: private: Modified: trunk/libzypp/zypp/RepoStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.cc?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.cc (original) +++ trunk/libzypp/zypp/RepoStatus.cc Mon Jun 18 18:05:43 2007 @@ -12,7 +12,7 @@ #include <iostream> //#include "zypp/base/Logger.h" #include "zypp/RepoStatus.h" - +#include "zypp/PathInfo.h" using namespace std; @@ -66,7 +66,7 @@ // METHOD TYPE : Ctor // RepoStatus::RepoStatus() - : _pimpl( Impl::nullimpl() ) + : _pimpl( new Impl() ) {} /////////////////////////////////////////////////////////////////// @@ -77,6 +77,11 @@ RepoStatus::~RepoStatus() {} + RepoStatus::RepoStatus( const Pathname &path ) + { + _pimpl->checksum = filesystem::sha1sum(path); + } + RepoStatus & RepoStatus::setChecksum( const string &checksum ) { _pimpl->checksum = checksum; Modified: trunk/libzypp/zypp/RepoStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.h?rev=57… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.h (original) +++ trunk/libzypp/zypp/RepoStatus.h Mon Jun 18 18:05:43 2007 @@ -73,6 +73,15 @@ public: /** Default ctor */ RepoStatus(); + + /** + * \short Status from a single file + * As most repository state is represented + * by the status of the index file, you can + * construct the status from a file. + */ + RepoStatus( const Pathname &file ); + /** Dtor */ ~RepoStatus(); Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Mon Jun 18 18:05:43 2007 @@ -717,8 +717,8 @@ } void CacheStore::updateRepository( const RecordId &id, - const string &checksum, - const Date &timestamp ) + const string &checksum, + const Date &timestamp ) { _pimpl->update_repository_cmd->bind(":repository_id", id); _pimpl->update_repository_cmd->bind(":checksum", checksum); @@ -782,7 +782,7 @@ { sqlite3_reader reader = cmd.executereader(); RepoStatus status; - while ( reader.read() ) + if ( reader.read() ) { status.setChecksum( reader.getstring(2) ); status.setTimestamp( reader.getstring(3) ); Modified: trunk/libzypp/zypp/parser/IniDict.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniDict.cc?r… ============================================================================== --- trunk/libzypp/zypp/parser/IniDict.cc (original) +++ trunk/libzypp/zypp/parser/IniDict.cc Mon Jun 18 18:05:43 2007 @@ -91,7 +91,19 @@ { return make_map_key_end( _dict ); } + + void IniDict::insertEntry( const std::string &section, + const std::string &key, + const std::string &value ) + { + consume( section, key, value ); + } + void IniDict::deleteSection( const std::string &section ) + { + _dict.erase(section); + } + /****************************************************************** ** ** FUNCTION NAME : operator<< @@ -99,6 +111,19 @@ */ std::ostream & operator<<( std::ostream & str, const IniDict & obj ) { + for ( IniDict::section_const_iterator si = obj.sectionsBegin(); + si != obj.sectionsEnd(); + ++si ) + { + str << "[" << *si << "]" << endl; + for ( IniDict::entry_const_iterator ei = obj.entriesBegin(*si); + ei != obj.entriesEnd(*si); + ++ei ) + { + str << ei->first << " = " << ei->second << endl; + } + str << endl; + } return str; } Modified: trunk/libzypp/zypp/parser/IniDict.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniDict.h?re… ============================================================================== --- trunk/libzypp/zypp/parser/IniDict.h (original) +++ trunk/libzypp/zypp/parser/IniDict.h Mon Jun 18 18:05:43 2007 @@ -85,21 +85,41 @@ * Creates a dictionary from a InputStream * containing a ini structured file */ - IniDict( const InputStream &is, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + IniDict( const InputStream &is, + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); /** Dtor */ ~IniDict(); + /** + * \short add an entry + * \param section + * \param key + * \param value + */ + void insertEntry( const std::string &section, + const std::string &key, + const std::string &value ); + + /** + * \short add an entry + * \param section + * \param key + * \param value + */ + void deleteSection( const std::string &section ); + public: /** Called when a section is found. */ virtual void consume( const std::string &section ); /** Called when a key value is found. */ - virtual void consume( const std::string &section, const std::string &key, const std::string &value ); + virtual void consume( const std::string &section, + const std::string &key, + const std::string &value ); private: SectionSet _dict; - /** * empty map used to simulate * iteration in non existant Modified: trunk/libzypp/zypp/parser/RepoFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoFileRead… ============================================================================== --- trunk/libzypp/zypp/parser/RepoFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoFileReader.cc Mon Jun 18 18:05:43 2007 @@ -61,7 +61,7 @@ else if ( it->first == "type" ) info.setType(repo::RepoType(it->second)); } - + info.setFilepath(file); // add it to the list. callback(info); //if (!progress.tick()) Modified: trunk/libzypp/zypp/repo/susetags/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downl… ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.cc Mon Jun 18 18:05:43 2007 @@ -23,6 +23,13 @@ } +RepoStatus Downloader::status() +{ + MediaSetAccess media(_url, _path); + Pathname content = media.provideFile("/content"); + return RepoStatus(content); +} + void Downloader::download( const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress ) { Modified: trunk/libzypp/zypp/repo/susetags/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downl… ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.h (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.h Mon Jun 18 18:05:43 2007 @@ -13,6 +13,7 @@ #include "zypp/Url.h" #include "zypp/Pathname.h" #include "zypp/ProgressData.h" +#include "zypp/RepoStatus.h" namespace zypp { @@ -27,6 +28,10 @@ Downloader( const Url &url, const Pathname &path ); void download( const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + /** + * \short Status of the remote repository + */ + RepoStatus status(); private: Url _url; Pathname _path; Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader… ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Mon Jun 18 18:05:43 2007 @@ -35,6 +35,12 @@ { } +RepoStatus Downloader::status() +{ + Pathname repomd = _media.provideFile("/repodata/repomd.xml"); + return RepoStatus(repomd); +} + bool Downloader::patches_Callback( const OnMediaLocation &loc, const string &id ) { MIL << id << " : " << loc << endl; Modified: trunk/libzypp/zypp/repo/yum/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader… ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.h (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.h Mon Jun 18 18:05:43 2007 @@ -18,6 +18,7 @@ #include "zypp/parser/xml/Reader.h" #include "zypp/repo/yum/ResourceType.h" #include "zypp/ProgressData.h" +#include "zypp/RepoStatus.h" namespace zypp { @@ -48,6 +49,11 @@ void download( const Pathname &dest_dir, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + /** + * \short Status of the remote repository + */ + RepoStatus status(); + protected: bool repomd_Callback( const OnMediaLocation &loc, const ResourceType &dtype ); bool patches_Callback( const OnMediaLocation &loc, const std::string &id ); -- 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] r5771 - in /trunk/libzypp: CMakeLists.txt VERSION.cmake package/libzypp.changes
by mvidner＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mvidner Date: Mon Jun 18 17:22:21 2007 New Revision: 5771 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5771&view=rev Log: Fixed so versioning from libtool to cmake conventions. Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=5771&… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Mon Jun 18 17:22:21 2007 @@ -23,13 +23,16 @@ INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) MATH( EXPR LIBZYPP_CURRENT "${LIBZYPP_MAJOR} * 100 + ${LIBZYPP_MINOR}" ) MATH( EXPR LIBZYPP_AGE "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" ) +# Libtool wanted current:patch:age +# But cmake is not libtool, it wants the verbatim suffix to libzypp.so +MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( PACKAGE "libzypp" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) ADD_DEFINITIONS( -g ) ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) -SET( LIBZYPP_VERSION_INFO "${LIBZYPP_CURRENT}.${LIBZYPP_PATCH}.${LIBZYPP_AGE}" ) +SET( LIBZYPP_VERSION_INFO "${LIBZYPP_SO_FIRST}.${LIBZYPP_AGE}.${LIBZYPP_PATCH}" ) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.") @@ -157,7 +160,7 @@ MESSAGE( STATUS "doxygen found: ${DOXYGEN}" ) ENDIF ( NOT DOXYGEN ) -MESSAGE(STATUS "soname: ${LIBZYPP_CURRENT}.${LIBZYPP_PATCH}.${LIBZYPP_AGE}") +MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}") MESSAGE(STATUS "version: ${VERSION}") #################################################################### Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=5771&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Jun 18 17:22:21 2007 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "3") -SET(LIBZYPP_MINOR "2") -SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "3") +SET(LIBZYPP_COMPATMINOR "3") +SET(LIBZYPP_PATCH "0") 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 Mon Jun 18 17:22:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 18 17:20:45 CEST 2007 - mvidner(a)suse.cz + +- fixed so versioning from libtool to cmake +- 3.3.0 + +------------------------------------------------------------------- Mon Jun 18 09:47:32 CEST 2007 - dmacvicar(a)suse.de - Use gpg2 instead of gpg for keyring and make -- 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] r5770 - in /trunk/libzypp/zypp: data/RecordId.h parser/susetags/RepoIndex.h
by mvidner＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mvidner Date: Mon Jun 18 17:18:38 2007 New Revision: 5770 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5770&view=rev Log: tiny doc improvements Modified: trunk/libzypp/zypp/data/RecordId.h trunk/libzypp/zypp/parser/susetags/RepoIndex.h Modified: trunk/libzypp/zypp/data/RecordId.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/RecordId.h?rev… ============================================================================== --- trunk/libzypp/zypp/data/RecordId.h (original) +++ trunk/libzypp/zypp/data/RecordId.h Mon Jun 18 17:18:38 2007 @@ -18,7 +18,7 @@ { namespace data { - /** Chache strore record id. */ + /** Cache store record id. */ typedef DefaultIntegral<long long, -1> RecordId; /** The default RecordId is a value we don't use for records. */ static const RecordId noRecordId; Modified: trunk/libzypp/zypp/parser/susetags/RepoIndex.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/Rep… ============================================================================== --- trunk/libzypp/zypp/parser/susetags/RepoIndex.h (original) +++ trunk/libzypp/zypp/parser/susetags/RepoIndex.h Mon Jun 18 17:18:38 2007 @@ -41,8 +41,9 @@ // // CLASS NAME : RepoIndex // - /** Repository content data. + /** Repository content data (from /content file). * File and Checksum definitions required by Downloader and Parser. + * (Do not confuse with NU's repoindex.xml) */ class RepoIndex : public base::ReferenceCounted, private base::NonCopyable { -- 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] r5769 - in /trunk/zypper: doc/zypper-rug src/zypper-misc.cc src/zypper-search.cc src/zypper-sources.cc src/zypper.cc src/zypper.h
by jkupec＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: jkupec Date: Mon Jun 18 15:53:41 2007 New Revision: 5769 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5769&view=rev Log: backup Modified: trunk/zypper/doc/zypper-rug trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/doc/zypper-rug URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper-rug?rev=5769&r… ============================================================================== --- trunk/zypper/doc/zypper-rug (original) +++ trunk/zypper/doc/zypper-rug Mon Jun 18 15:53:41 2007 @@ -16,93 +16,96 @@ --no-abbrev No abbreviation --debug Debug output, print full exception traces --quiet Quiet output, print only error messages - - Bundle management: -N1 bundle-history (bhi) Search bundle log entries -N1 bundle-install (bin) Install bundles -N1 bundle-list (bl) List the available bundles -N1 bundle-lock-add (bla) Add a bundle lock rule -N1 bundle-lock-delete (bld) Delete a bundle lock -N1 bundle-lock-list (bll) List bundle locks -N1 bundle-remove (brm) Remove bundles -N1 bundle-search (bse) Search for bundles -N1 bundle-upgrade (bup) Upgrade bundles -? catalogs (ca) List the available catalogs -? subscribe (sub) Subscribe to catalogs -? unsubscribe (unsub) Unsubscribe to catalogs - - Other: - Unknown! - - Package management: -N1 bundle-packages (bp) Show the packages in a given bundle -N1 checkpoint-add (cpa) Add a check point -N1 checkpoint-remove (cpr) Remove a check point -N1 checkpoints (cp) Get a list of saved check points -N1 dump Get an dump of system information as a sqlite database -+ file-list (fl) List files within a package -N1 history (hi) Search log entries -++ info (if) Show the full info for packages -+ info-conflicts (ic) List all conflicts for package -+ info-obsoletes (io) List all obsoletes for package -+ info-provides (ip) List package's provides -+ info-requirements (ir) List package's requirements -++ install (in) Install packages -++ list-updates (lu) Show the available updates. -+ package-file (pf) Get package which contains file -+ packages (pa) Show the packages in a given catalog -+ patch-search (pse) Search for patches matching a pattern -++ remove (rm) Remove packages -N1 rollback (ro) Rollback packages to a specified date -++ search (se) Search for packages matching a pattern -+1 summary (sum) Show a per-catalog summary of available updates. -++ update (up) Update packages -? verify (ve) Verify system dependencies -+ what-conflicts (wc) List packages that conflict with a given token -+ what-provides (wp) Show which packages provide a given token -+ what-requires (wr) Show which packages require a given token - - Patch management: -++ patches (pch) Show the patches in a given catalog -++ patch-info Show detailed information for a patch - - Pattern management: -+ pattern-info Show detailed information for a pattern -+ patterns (pt) Show the patterns in a given catalog - - Preference management: -? get-prefs (get prefs) List the system preferences that may be set -? set-prefs (set) Set a preference variable - - Product management: -+ product-info Show detailed information for a product -+ products (pd) Show the products in a given catalog - - Security: -N1 key-add (ka) Add to the list of whitelisted keys for a service -N1 key-delete (kd) Remove from the list of whitelisted keys for a service -N1 key-list (kl) Display whitelisted keys for a service - - Service management: -? mount Mount directory as a channel -++ refresh (ref) Refresh all or some services -? register (reg) Register a service -++ service-add (sa) Add a service -++ service-delete (sd) Delete a service -++ service-list (sl) List the available services -? service-types (st) List the available service types - - System: -? clean-cache (cc) Clean the HTTP cache -N1 load-modules (lm) Load ZMD modules -N1 ping Ping the deamon -N1 restart Restart the daemon -N1 schedules (sch) Show scheduled items -N1 shutdown Shut down the daemon -N1 sleep Put the daemon to sleep - - User management: -N1 user-add (ua) Add a new user -N1 user-delete (ud) Delete users -N1 user-edit (ue) Edit an existing user -N1 user-list (ul) List users + +------------------+----+----------------------------+---------------------------- + zypper command | St | rug command | rug description +------------------+----+----------------------------+---------------------------- + Bundle management: + N1 bundle-history (bhi) Search bundle log entries + N1 bundle-install (bin) Install bundles + N1 bundle-list (bl) List the available bundles + N1 bundle-lock-add (bla) Add a bundle lock rule + N1 bundle-lock-delete (bld) Delete a bundle lock + N1 bundle-lock-list (bll) List bundle locks + N1 bundle-remove (brm) Remove bundles + N1 bundle-search (bse) Search for bundles + N1 bundle-upgrade (bup) Upgrade bundles + ? catalogs (ca) List the available catalogs + ? subscribe (sub) Subscribe to catalogs + ? unsubscribe (unsub) Unsubscribe to catalogs + + Other: + Unknown! + + Package management: + N1 bundle-packages (bp) Show the packages in a given bundle + N1 checkpoint-add (cpa) Add a check point + N1 checkpoint-remove (cpr) Remove a check point + N1 checkpoints (cp) Get a list of saved check points + N1 dump Get an dump of system information as a sqlite database + + file-list (fl) List files within a package + N1 history (hi) Search log entries + info ++ info (if) Show the full info for packages + + info-conflicts (ic) List all conflicts for package + + info-obsoletes (io) List all obsoletes for package + + info-provides (ip) List package's provides + + info-requirements (ir) List package's requirements + install ++ install (in) Install packages + ++ list-updates (lu) Show the available updates. + + package-file (pf) Get package which contains file + + packages (pa) Show the packages in a given catalog + + patch-search (pse) Search for patches matching a pattern + remove ++ remove (rm) Remove packages + N1 rollback (ro) Rollback packages to a specified date + search ++ search (se) Search for packages matching a pattern + update +1 summary (sum) Show a per-catalog summary of available updates. + ++ update (up) Update packages + ? verify (ve) Verify system dependencies + + what-conflicts (wc) List packages that conflict with a given token + + what-provides (wp) Show which packages provide a given token + + what-requires (wr) Show which packages require a given token + + Patch management: + search -t patch ++ patches (pch) Show the patches in a given catalog + info -t patch ++ patch-info Show detailed information for a patch + + Pattern management: + info -t pattern + pattern-info Show detailed information for a pattern + search -t pattern + patterns (pt) Show the patterns in a given catalog + + Preference management: + ? get-prefs (get prefs) List the system preferences that may be set + ? set-prefs (set) Set a preference variable + + Product management: + info -t product + product-info Show detailed information for a product + search -t product + products (pd) Show the products in a given catalog + + Security: + N1 key-add (ka) Add to the list of whitelisted keys for a service + N1 key-delete (kd) Remove from the list of whitelisted keys for a service + N1 key-list (kl) Display whitelisted keys for a service + + Service management: + ? mount Mount directory as a channel + refresh ++ refresh (ref) Refresh all or some services + ? register (reg) Register a service + addrepo ++ service-add (sa) Add a service + rmrepo ++ service-delete (sd) Delete a service + listrepos ++ service-list (sl) List the available services + ? service-types (st) List the available service types + + System: + ? clean-cache (cc) Clean the HTTP cache + N1 load-modules (lm) Load ZMD modules + N1 ping Ping the deamon + N1 restart Restart the daemon + N1 schedules (sch) Show scheduled items + N1 shutdown Shut down the daemon + N1 sleep Put the daemon to sleep + + User management: + N1 user-add (ua) Add a new user + N1 user-delete (ud) Delete users + N1 user-edit (ue) Edit an existing user + N1 user-list (ul) List users Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=57… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Jun 18 15:53:41 2007 @@ -448,24 +448,31 @@ Repository repository; - try { + try + { + if (!manager.isCached(repo)) + { + cout_v << format(_("Repository '%s' not cached. Caching...")) + % repo.alias() << endl; + manager.buildCache(repo); + } + repository = manager.createFromCache(repo); + ResStore store = repository.resolvables(); + God->addResolvables(store); + + cout_vv << format(_("(%d resolvables found)")) % store.size() << endl; } catch ( const repo::RepoNotCachedException &e ) { - ZYPP_CAUGHT(e); - cout_v << "Repository " << repo.alias() << " not cached. Caching..." << endl; - manager.buildCache(repo); - repository = manager.createFromCache(repo); + ZYPP_CAUGHT(e); + cerr << format(_("Problem loading data from '%s'")) % repo.alias(); + cerr_v << ":" << e.msg(); + cerr << endl; + cerr << format(_("Resolvables from '%s' not loaded because of error.")) + % repo.alias() << endl; } - - ResStore store = repository.resolvables(); - //! \todo use format - cout_vv << "(" << store.size() << " resolvables found)" << endl; - - God->addResolvables(store); } - } void establish () Modified: trunk/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.cc?rev=… ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/zypper-search.cc Mon Jun 18 15:53:41 2007 @@ -38,18 +38,19 @@ _zypp(zypp), _options(options), _qstrings(qstrings) { cond_init_target(); // calls ZYpp::initializeTarget("/"); - cond_init_system_sources(); // calls manager->restore("/"); + init_repos(); // no sources warning - if (gData.sources.empty()) { - cerr << _("No sources. Zypper currently searches within installation" - "sources only.") << endl; - exit(2); // TODO #define zypper error codes? + if (gData.repos.empty()) { + cerr << _("No repositories configured. Please, add at least one" + " repository using 'zypper addrepo' command before using search.") + << endl; + exit(ZYPPER_EXIT_NO_REPOS); // TODO #define zypper error codes? } setupRegexp(); cacheInstalled(); - load_sources(); // populates ResPool with resolvables from inst. sources + load_repo_resolvables(); // populates ResPool with resolvables from repos // cache identification strings of source resolvables (used to check for // duplicates of target resolvables in sources - DuplicateFilter) Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Mon Jun 18 15:53:41 2007 @@ -176,7 +176,8 @@ { cerr << format(_("Error reading repository '%s':")) % repo.alias() << endl << e.msg() << endl; - cerr << format(_("Skipping repository '%s'")) % repo.alias() + cerr << format(_("Skipping repository '%s' because of the above error.")) + % repo.alias() << endl; } } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=5769&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Jun 18 15:53:41 2007 @@ -629,8 +629,6 @@ cond_init_target (); return add_repo_by_url(url, alias, type, enabled, refresh); - - return ZYPPER_EXIT_OK; } // --------------------------( service delete )----------------------------- Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=5769&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Mon Jun 18 15:53:41 2007 @@ -39,6 +39,8 @@ #define ZYPPER_EXIT_ERR_INVALID_ARGS 3 // invalid arguments given, e.g. zypper source-add httttps://asdf.net #define ZYPPER_EXIT_ERR_ZYPP 4 // error indicated from within libzypp, e.g. God = zypp::getZYpp() threw an exception #define ZYPPER_EXIT_ERR_PRIVILEGES 5 // unsufficient privileges for the operation +#define ZYPPER_EXIT_NO_REPOS 6 // no repositories defined + // info #define ZYPPER_EXIT_INF_UPDATE_NEEDED 100 // update needed #define ZYPPER_EXIT_INF_SEC_UPDATE_NEEDED 101 // security update needed -- 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] r5768 - in /trunk/libzypp: tests/zypp/RepoInfo_test.cc tests/zypp/RepoManager_test.cc zypp/cache/CacheStore.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 15:44:29 2007 New Revision: 5768 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5768&view=rev Log: -add test for reponfo - fix missing binds Added: trunk/libzypp/tests/zypp/RepoInfo_test.cc Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc trunk/libzypp/zypp/cache/CacheStore.cc Added: trunk/libzypp/tests/zypp/RepoInfo_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/RepoInfo_test… ============================================================================== --- trunk/libzypp/tests/zypp/RepoInfo_test.cc (added) +++ trunk/libzypp/tests/zypp/RepoInfo_test.cc Mon Jun 18 15:44:29 2007 @@ -0,0 +1,56 @@ + +#include <iostream> +#include <fstream> +#include <list> +#include <string> + +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" + +#include "zypp/RepoInfo.h" + +#include <boost/test/unit_test.hpp> +#include <boost/test/parameterized_test.hpp> +#include <boost/test/unit_test_log.hpp> + +#include "KeyRingTestReceiver.h" + +using boost::unit_test::test_suite; +using boost::unit_test::test_case; +using namespace boost::unit_test::log; + +using namespace std; +using namespace zypp; +using namespace zypp::filesystem; +using namespace zypp::repo; + +void repoinfo_test( const string &dir ) +{ + +} + +test_suite* +init_unit_test_suite( int argc, char* argv[] ) +{ + string datadir; + if (argc < 2) + { + datadir = TESTS_SRC_DIR; + datadir = (Pathname(datadir) + "/zypp/data/RepoInfo").asString(); + cout << "repoinfo_test:" + " path to directory with test data required as parameter. Using " << datadir << endl; + //return (test_suite *)0; + } + else + { + datadir = argv[1]; + } + + std::string const params[] = { datadir }; + //set_log_stream( std::cout ); + test_suite* test= BOOST_TEST_SUITE( "RepoInfoTest" ); + test->add(BOOST_PARAM_TEST_CASE( &repoinfo_test, + (std::string const*)params, params+1)); + return test; +} + Modified: trunk/libzypp/tests/zypp/RepoManager_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/RepoManager_t… ============================================================================== --- trunk/libzypp/tests/zypp/RepoManager_test.cc (original) +++ trunk/libzypp/tests/zypp/RepoManager_test.cc Mon Jun 18 15:44:29 2007 @@ -62,6 +62,16 @@ ResStore store = repository.resolvables(); MIL << store.size() << " resolvables" << endl; + + manager.refreshMetadata(repo); + + if ( manager.isCached(repo ) ) + { + MIL << "Repo already in cache, clean cache"<< endl; + manager.cleanCache(repo); + } + MIL << "Parsing repository metadata..." << endl; + manager.buildCache(repo); } test_suite* Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Mon Jun 18 15:44:29 2007 @@ -886,6 +886,7 @@ long long id = 0; try { + _pimpl->select_name_cmd->bind(":name", name); sqlite3_reader reader= _pimpl->select_name_cmd->executereader(); if (!reader.read()) { @@ -910,6 +911,7 @@ long long id = 0; try { + _pimpl->select_dirname_cmd->bind(":name", name); sqlite3_reader reader= _pimpl->select_dirname_cmd->executereader(); if (!reader.read()) { @@ -933,6 +935,7 @@ long long id = 0; try { + _pimpl->select_filename_cmd->bind(":name", name); sqlite3_reader reader= _pimpl->select_filename_cmd->executereader(); if (!reader.read()) { -- 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] r5767 - in /trunk/libzypp/zypp: RepoInfo.cc RepoInfo.h RepoManager.cc RepoManager.h cache/CacheStore.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 15:13:54 2007 New Revision: 5767 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5767&view=rev Log: fix exception add filepath to repoinfo Modified: trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/cache/CacheStore.cc Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=576… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Mon Jun 18 15:13:54 2007 @@ -47,7 +47,7 @@ std::set<Url> baseUrls; std::string alias; std::string name; - + Pathname filepath; public: private: @@ -133,6 +133,12 @@ return *this; } + RepoInfo & RepoInfo::setFilepath( const Pathname &filepath ) + { + _pimpl->filepath = filepath; + return *this; + } + tribool RepoInfo::enabled() const { return _pimpl->enabled; } @@ -145,6 +151,9 @@ std::string RepoInfo::name() const { return _pimpl->name; } + Pathname RepoInfo::filepath() const + { return _pimpl->filepath; } + repo::RepoType RepoInfo::type() const { return _pimpl->type; } Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=5767… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Mon Jun 18 15:13:54 2007 @@ -133,6 +133,14 @@ std::string name() const; /** + * \short File where this repo was read from + * + * \note could be an empty pathname for repo + * infos created in memory. + */ + Pathname filepath() const; + + /** * Add a base url. \see baseUrls * \param url The base url for the repository. * @@ -176,6 +184,12 @@ */ RepoInfo & setName( const std::string &name ); + /** + * \short set the repository filepath + * \param path File path + */ + RepoInfo & setFilepath( const Pathname &filename ); + std::ostream & dumpOn( std::ostream & str ) const; std::ostream & dumpRepoOn( std::ostream & str ) const; 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 Mon Jun 18 15:13:54 2007 @@ -450,7 +450,34 @@ void RepoManager::addRepositories( const Url &url, const ProgressData::ReceiverFnc & progressrcv ) { - + std::list<RepoInfo> knownrepos = knownRepositories(); + std::list<RepoInfo> repos = readRepoFile(url); + for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); + ++it ) + { + // look if the alias is in the known repos. + for ( std::list<RepoInfo>::const_iterator kit = knownrepos.begin(); + kit != repos.end(); + ++kit ) + { + if ( (*it).alias() == (*kit).alias() ) + ZYPP_THROW(RepoAlreadyExistsException((*it).alias())); + } + } + + Pathname filename = Pathname(url.getPathName()).basename(); + + if ( filename == Pathname() ) + ZYPP_THROW(RepoException("Invalid repo file name at " + url.asString() )); + + // FIXME move this code to a separate function + Pathname final_filename = filename; + int counter = 1; + while ( PathInfo(_pimpl->options.knownReposPath + filename).isExist() ) + { + filename = Pathname( filename.asString() ); + } } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Mon Jun 18 15:13:54 2007 @@ -73,6 +73,16 @@ /** Dtor */ ~RepoManager(); + enum RepoRefreshPolicy + { + RefreshIfChanged, + RefreshForced + }; + + enum RepoAddPolicy + { + }; + /** * \short List known repositories. * Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Mon Jun 18 15:13:54 2007 @@ -802,16 +802,22 @@ bool CacheStore::isCached( const string &alias ) { + sqlite3_command cmd(_pimpl->con, "select id from repositories where alias=:alias;"); + cmd.bind(":alias", alias); try { - lookupRepository(alias); + sqlite3_reader reader= cmd.executereader(); + if (!reader.read()) + { + return false; + } + return true; } - catch( const CacheRecordNotFoundException &e ) + catch ( const sqlite3x::database_error &e ) { - return false; + ZYPP_RETHROW(e); } - - return true; + return false; } RecordId CacheStore::lookupRepository( const string &alias ) -- 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] r5766 - /trunk/zypper/src/zypper-sources.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 12:52:17 2007 New Revision: 5766 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5766&view=rev Log: compile Modified: trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Mon Jun 18 12:52:17 2007 @@ -283,7 +283,7 @@ //! \todo handle local .repo files, validate the URL Url url(repo_file_url); RepoManager manager; - list<RepoInfo> repos = manager.readRepoFile(url); + list<RepoInfo> repos = readRepoFile(url); for (list<RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it) -- 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] r5765 - in /trunk/libzypp: tests/zypp/CMakeLists.txt zypp/RepoInfo.cc zypp/RepoInfo.h zypp/RepoManager.cc zypp/RepoManager.h zypp/repo/RepoException.cc zypp/repo/RepoException.h
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 12:49:43 2007 New Revision: 5765 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5765&view=rev Log: - move repo file read function out of repomanager - start implementing add repo - repoinfo -> repofile serialization Modified: trunk/libzypp/tests/zypp/CMakeLists.txt trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/repo/RepoException.cc trunk/libzypp/zypp/repo/RepoException.h Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.tx… ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Mon Jun 18 12:49:43 2007 @@ -49,6 +49,9 @@ ADD_EXECUTABLE( RepoManager RepoManager_test.cc ) TARGET_LINK_LIBRARIES( RepoManager zypp boost_unit_test_framework ) +ADD_EXECUTABLE( RepoInfo RepoInfo_test.cc ) +TARGET_LINK_LIBRARIES( RepoInfo zypp boost_unit_test_framework ) + ADD_TEST(ArchTest ${CMAKE_CURRENT_BINARY_DIR}/Arch) ADD_TEST(UrlTest ${CMAKE_CURRENT_BINARY_DIR}/Url) ADD_TEST(Edition ${CMAKE_CURRENT_BINARY_DIR}/Edition) @@ -64,4 +67,5 @@ ADD_TEST(MediaSetAccessTest ${CMAKE_CURRENT_BINARY_DIR}/MediaSetAccess ${CMAKE_CURRENT_SOURCE_DIR}/data/mediasetaccess) ADD_TEST(FileCheckerTest ${CMAKE_CURRENT_BINARY_DIR}/FileChecker ${CMAKE_CURRENT_SOURCE_DIR}/data/FileChecker) ADD_TEST(RepoManagerTest ${CMAKE_CURRENT_BINARY_DIR}/RepoManager ${CMAKE_CURRENT_SOURCE_DIR}/data/RepoManager) +ADD_TEST(RepoInfoTest ${CMAKE_CURRENT_BINARY_DIR}/RepoInfo ${CMAKE_CURRENT_SOURCE_DIR}/data/RepoInfo) ADD_TEST(FetcherTest ${CMAKE_CURRENT_BINARY_DIR}/Fetcher) Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=576… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Mon Jun 18 12:49:43 2007 @@ -179,6 +179,25 @@ return str; } + std::ostream & RepoInfo::dumpRepoOn( std::ostream & str ) const + { + str << "[" << alias() << "]" << endl; + str << "name = " << name() << endl; + + if ( ! baseUrls().empty() ) + str << "baseurl = "; + for ( urls_const_iterator it = baseUrlsBegin(); + it != baseUrlsEnd(); + ++it ) + { + str << *it << endl; + } + str << "mirrorlist = " << mirrorListUrl() << endl; + str << "type = " << type().asString() << endl; + str << "enabled = " << (enabled() ? "1" : "0") << endl; + return str; + } + std::ostream & operator<<( std::ostream & str, const RepoInfo & obj ) { return obj.dumpOn(str); Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=5765… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Mon Jun 18 12:49:43 2007 @@ -178,6 +178,8 @@ std::ostream & dumpOn( std::ostream & str ) const; + std::ostream & dumpRepoOn( std::ostream & str ) const; + class Impl; private: /** Pointer to implementation */ 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 Mon Jun 18 12:49:43 2007 @@ -44,24 +44,6 @@ namespace zypp { ///////////////////////////////////////////////////////////////// -// class SubJobReceiverFnc -// { -// SubJobReceiverFnc( ProgressData::value_type jobtotal, const ProgressData::ReceiverFnc &receiver ) -// : _jobtotal(jobtotal) -// , _receiver(receiver) -// { -// -// } -// -// bool operator()( ProgressData::value_type progress ) -// { -// return true; -// } -// -// ProgressData::value_type _jobtotal; -// ProgressData::ReceiverFnc _receiver; -// }; - /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoManagerOptions @@ -75,40 +57,42 @@ repoRawCachePath = globalConfig.defaultRepoRawCachePath(); knownReposPath = globalConfig.defaultKnownReposPath(); } - + + //////////////////////////////////////////////////////////////////////////// + /** - * \short Simple callback to collect the results - * - * Classes like RepoFileParser call the callback - * once per each repo in a file. - * - * Passing this functor as callback, you can collect - * all resuls at the end, without dealing with async - * code. - */ - struct RepoCollector - { - RepoCollector() - { - MIL << endl; - } - - ~RepoCollector() + * \short Simple callback to collect the results + * + * Classes like RepoFileParser call the callback + * once per each repo in a file. + * + * Passing this functor as callback, you can collect + * all resuls at the end, without dealing with async + * code. + */ + struct RepoCollector { - MIL << endl; - } + RepoCollector() + { + MIL << endl; + } + + ~RepoCollector() + { + MIL << endl; + } + + bool collect( const RepoInfo &repo ) + { + //MIL << "here in collector: " << repo.alias() << endl; + repos.push_back(repo); + //MIL << "added: " << repo.alias() << endl; + return true; + } - bool collect( const RepoInfo &repo ) - { - //MIL << "here in collector: " << repo.alias() << endl; - repos.push_back(repo); - //MIL << "added: " << repo.alias() << endl; - return true; - } - - RepoInfoList repos; - }; - + RepoInfoList repos; + }; + //////////////////////////////////////////////////////////////////////////// /** @@ -125,6 +109,23 @@ } //////////////////////////////////////////////////////////////////////////// + + std::list<RepoInfo> readRepoFile(const Url & repo_file) + { + // no interface to download a specific file, using workaround: + //! \todo add MediaManager::provideFile(Url file_url) to easily access any file URLs? (no need for media access id or media_nr) + Url url(repo_file); + Pathname path(url.getPathName()); + url.setPathName ("/"); + MediaSetAccess access(url); + Pathname local = access.provideFile(path); + + DBG << "reading repo file " << repo_file << ", local path: " << local << endl; + + return repositories_in_file(local); + } + + //////////////////////////////////////////////////////////////////////////// /** * \short List of RepoInfo's from a directory @@ -251,25 +252,6 @@ } //////////////////////////////////////////////////////////////////////////// - - std::list<RepoInfo> RepoManager::readRepoFile(const Url & repo_file) const - { - - // no interface to download a specific file, using workaround: - //! \todo add MediaManager::provideFile(Url file_url) to easily access any file URLs? (no need for media access id or media_nr) - Url url(repo_file); - Pathname path(url.getPathName()); - url.setPathName ("/"); - - MediaSetAccess access(url); - Pathname local = access.provideFile(path); - - DBG << "reading repo file " << repo_file << ", local path: " << local << endl; - - return repositories_in_file(local); - } - - //////////////////////////////////////////////////////////////////////////// void RepoManager::refreshMetadata( const RepoInfo &info, const ProgressData::ReceiverFnc & progress ) @@ -449,11 +431,26 @@ } //////////////////////////////////////////////////////////////////////////// - + void RepoManager::addRepository( const RepoInfo &info, - const ProgressData::ReceiverFnc & progress ) + const ProgressData::ReceiverFnc & progressrcv ) { + assert_alias(info); + std::list<RepoInfo> repos = knownRepositories(); + for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); + ++it ) + { + if ( info.alias() == (*it).alias() ) + ZYPP_THROW(RepoAlreadyExistsException(info.alias())); + } + } + + void RepoManager::addRepositories( const Url &url, + const ProgressData::ReceiverFnc & progressrcv ) + { + } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Mon Jun 18 12:49:43 2007 @@ -30,6 +30,19 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + /** + * Parses \a repo_file and returns a list of \ref RepoInfo objects + * corresponding to repositories found within the file. + * + * \param repo_file Valid URL of the repo file. + * \return found list<RepoInfo> + * + * \throws MediaException If the access to the url fails + * \throws ParseException If the file parsing fails + * \throws Exception On other errors. + */ + std::list<RepoInfo> readRepoFile(const Url & repo_file); + /** * Repo manager settings. * Settings default to ZYpp global settings. @@ -70,15 +83,6 @@ */ std::list<RepoInfo> knownRepositories() const; - /** - * Parses \a repo_file and returns a list of \ref RepoInfo objects - * corresponding to repositories found within the file. - * - * \param repo_file Valid URL of the repo file. - * \return found list<RepoInfo> - */ - std::list<RepoInfo> readRepoFile(const Url & repo_file) const; - /** * \short Refresh local raw cache * @@ -165,16 +169,26 @@ * * \throws repo::RepoAlreadyExistsException If the repo clash some * unique attribute like alias + * + * \throws RepoAlreadyExistsException */ void addRepository( const RepoInfo &info, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** - * Adds a .repo file directly, which can contain - * one or more repositories. + * \short Adds repositores from a repo file to the list of known repositories. + * \param url Url of the repo file + * + * \throws repo::RepoAlreadyExistsException If the repo clash some + * unique attribute like alias + * + * \throws RepoAlreadyExistsException + * \throws MediaException If the access to the url fails + * \throws ParseException If the file parsing fails + * \throws Exception On other errors. */ - //void addRepositories( const Url &url ); - + void addRepositories( const Url &url, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * PROPOSAL */ Modified: trunk/libzypp/zypp/repo/RepoException.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoException.… ============================================================================== --- trunk/libzypp/zypp/repo/RepoException.cc (original) +++ trunk/libzypp/zypp/repo/RepoException.cc Mon Jun 18 12:49:43 2007 @@ -30,9 +30,6 @@ : Exception( msg_r ) {} - RepoException::~RepoException() throw() - {} - RepoNotCachedException::RepoNotCachedException() : RepoException( "Repository not Cached" ) {} @@ -41,15 +38,12 @@ : RepoException( msg_r ) {} - RepoNotCachedException::~RepoNotCachedException() throw() - {} - std::ostream & RepoException::dumpOn( std::ostream & str ) const { return Exception::dumpOn( str ); } - + ///////////////////////////////////////////////////////////////// } // namespace repo /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/RepoException.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoException.… ============================================================================== --- trunk/libzypp/zypp/repo/RepoException.h (original) +++ trunk/libzypp/zypp/repo/RepoException.h Mon Jun 18 12:49:43 2007 @@ -35,8 +35,6 @@ RepoException(); /** Ctor */ RepoException( const std::string & msg_r ); - /** Dtor */ - virtual ~RepoException() throw(); protected: virtual std::ostream & dumpOn( std::ostream & str ) const; }; @@ -52,7 +50,6 @@ public: RepoNotCachedException(); RepoNotCachedException( const std::string & msg_r ); - virtual ~RepoNotCachedException() throw(); }; /** @@ -79,7 +76,7 @@ */ class RepoNotFoundException : public RepoException { - + RepoNotFoundException(){} }; /** @@ -88,7 +85,25 @@ */ class RepoAlreadyExistsException : public RepoException { - + public: + ~RepoAlreadyExistsException() throw() + {} + + RepoAlreadyExistsException( const std::string &alias, + const std::string & msg_r ) + : RepoException(msg_r) + , _alias(alias) + {} + + RepoAlreadyExistsException( const std::string &alias ) + : _alias(alias) + {} + + std::string alias() + { return _alias; } + + private: + std::string _alias; }; /** -- 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] r5764 - /trunk/libzypp/doc/autodoc/Doxyfile.cmake
by mlandres＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: mlandres Date: Mon Jun 18 12:13:27 2007 New Revision: 5764 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5764&view=rev Log: remove ref. to zypp2 Modified: trunk/libzypp/doc/autodoc/Doxyfile.cmake Modified: trunk/libzypp/doc/autodoc/Doxyfile.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/autodoc/Doxyfile.cma… ============================================================================== --- trunk/libzypp/doc/autodoc/Doxyfile.cmake (original) +++ trunk/libzypp/doc/autodoc/Doxyfile.cmake Mon Jun 18 12:13:27 2007 @@ -71,7 +71,7 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @ZYPP_SOURCE_DIR@ @ZYPP_SOURCE_DIR@/../zypp2 +INPUT = @ZYPP_SOURCE_DIR@ FILE_PATTERNS = RECURSIVE = YES EXCLUDE = -- 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] r5763 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 09:48:02 2007 New Revision: 5763 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5763&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 Mon Jun 18 09:48:02 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 18 09:47:32 CEST 2007 - dmacvicar(a)suse.de + +- Use gpg2 instead of gpg for keyring and make + the package depend on it (#284211) + +------------------------------------------------------------------- Mon Jun 11 17:02:49 CEST 2007 - schubi(a)suse.de - Required kmp packges FOR EACH installed/to_be_installed kernel will be 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] r5762 - in /trunk/libzypp: libzypp.spec.cmake zypp/KeyRing.cc
by dmacvicar＠svn.opensuse.org 18 Jun '07

18 Jun '07

Author: dmacvicar Date: Mon Jun 18 09:47:27 2007 New Revision: 5762 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5762&view=rev Log: Use gpg2 in KeyRing and make the package depend on it (#284211) Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/zypp/KeyRing.cc Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=5… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Mon Jun 18 09:47:27 2007 @@ -26,7 +26,7 @@ BuildRequires: sqlite sqlite-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ graphviz hal-devel libxml2-devel rpm-devel gettext-devel BuildRequires: update-desktop-files - +Requires: gpg2 %description Package, Patch, Pattern, and Product Management Modified: trunk/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/KeyRing.cc?rev=5762… ============================================================================== --- trunk/libzypp/zypp/KeyRing.cc (original) +++ trunk/libzypp/zypp/KeyRing.cc Mon Jun 18 09:47:27 2007 @@ -32,6 +32,8 @@ #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypp::KeyRing" +#define GPG_BINARY "/usr/bin/gpg2" + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -262,7 +264,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -397,7 +399,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--list-public-keys", @@ -476,7 +478,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -503,7 +505,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--yes", "--quiet", @@ -537,7 +539,7 @@ const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", @@ -580,7 +582,7 @@ { const char* argv[] = { - "gpg", + GPG_BINARY, "--no-default-keyring", "--quiet", "--no-tty", -- 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] r5761 - in /trunk/libzypp: devel/devel.dmacvicar/ zypp/ zypp/cache/ zypp/repo/susetags/ zypp/repo/yum/
by dmacvicar＠svn.opensuse.org 17 Jun '07

17 Jun '07

Author: dmacvicar Date: Sun Jun 17 18:05:12 2007 New Revision: 5761 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5761&view=rev Log: - add progress hook to all time consuming tasks in repo manager. - start prototyping a sub-task progress handler in my devel dir Modified: trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt trunk/libzypp/devel/devel.dmacvicar/SUSETagsDownloader_tp.cc trunk/libzypp/devel/devel.dmacvicar/YUMDownloader_tp.cc trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc trunk/libzypp/devel/devel.dmacvicar/testbed.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/Fetcher.h trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/cache/CacheStore.h trunk/libzypp/zypp/repo/susetags/Downloader.cc trunk/libzypp/zypp/repo/susetags/Downloader.h trunk/libzypp/zypp/repo/yum/Downloader.cc trunk/libzypp/zypp/repo/yum/Downloader.h Modified: trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/CM… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt Sun Jun 17 18:05:12 2007 @@ -11,27 +11,21 @@ ADD_EXECUTABLE(cachestore CacheStore_tp.cc) TARGET_LINK_LIBRARIES(cachestore zypp ) -TARGET_LINK_LIBRARIES(cachestore zypp2 ) ADD_EXECUTABLE(testbed testbed.cc) TARGET_LINK_LIBRARIES(testbed zypp ) -TARGET_LINK_LIBRARIES(testbed zypp2 ) ADD_EXECUTABLE(yum-downloader YUMDownloader_tp.cc) TARGET_LINK_LIBRARIES(yum-downloader zypp ) -TARGET_LINK_LIBRARIES(yum-downloader zypp2 ) -ADD_EXECUTABLE(yum-reader YUMReader_tp.cc) -TARGET_LINK_LIBRARIES(yum-reader zypp ) -TARGET_LINK_LIBRARIES(yum-reader zypp2 ) +# ADD_EXECUTABLE(yum-reader YUMReader_tp.cc) +# TARGET_LINK_LIBRARIES(yum-reader zypp ) ADD_EXECUTABLE(cachedsource CachedSource_tp.cc) TARGET_LINK_LIBRARIES(cachedsource zypp ) -TARGET_LINK_LIBRARIES(cachedsource zypp2 ) ADD_EXECUTABLE(repomanager RepositoryManager_tp.cc) TARGET_LINK_LIBRARIES(repomanager zypp ) -TARGET_LINK_LIBRARIES(repomanager zypp2 ) FIND_PACKAGE(Zsync) IF(ZSYNC_FOUND) Modified: trunk/libzypp/devel/devel.dmacvicar/SUSETagsDownloader_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/SU… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/SUSETagsDownloader_tp.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/SUSETagsDownloader_tp.cc Sun Jun 17 18:05:12 2007 @@ -15,7 +15,7 @@ #include <zypp/MediaSetAccess.h> #include <zypp/source/SUSEMediaVerifier.h> #include <zypp/OnMediaLocation.h> -#include <zypp/source/susetags/SUSETagsDownloader.h> +#include <zypp/repo/susetags/Downloader.h> #include <zypp/Fetcher.h> #include "zypp/Product.h" @@ -25,7 +25,7 @@ using namespace std; using namespace zypp; using namespace media; -using namespace source::susetags; +using namespace repo::susetags; int main(int argc, char **argv) { @@ -36,7 +36,7 @@ try { ZYpp::Ptr z = getZYpp(); - SUSETagsDownloader downloader(Url(argv[1]), "/"); + Downloader downloader(Url(argv[1]), "/"); downloader.download(argv[2]); } catch ( const Exception &e ) Modified: trunk/libzypp/devel/devel.dmacvicar/YUMDownloader_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/YU… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/YUMDownloader_tp.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/YUMDownloader_tp.cc Sun Jun 17 18:05:12 2007 @@ -15,7 +15,7 @@ #include "zypp/MediaSetAccess.h" #include "zypp/source/SUSEMediaVerifier.h" #include "zypp/OnMediaLocation.h" -#include "zypp/source/yum/YUMDownloader.h" +#include "zypp/repo/yum/Downloader.h" #include "zypp/Fetcher.h" #include "zypp/Product.h" @@ -25,7 +25,7 @@ using namespace std; using namespace zypp; using namespace media; -using namespace source::yum; +using namespace repo::yum; int main(int argc, char **argv) { @@ -36,7 +36,7 @@ try { ZYpp::Ptr z = getZYpp(); - YUMDownloader downloader(Url(argv[1]), "/"); + Downloader downloader(Url(argv[1]), "/"); downloader.download(argv[2]); } catch ( const Exception &e ) Modified: trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/YU… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc Sun Jun 17 18:05:12 2007 @@ -6,7 +6,7 @@ #include "zypp/data/ResolvableDataConsumer.h" #include "zypp/base/Measure.h" #include "zypp/detail/ResObjectFactory.h" -#include "zypp/parser/yum/YUMParser.h" +#include "zypp/parser/yum/RepoParser.h" #include "zypp/repo/memory/PackageImpl.h" @@ -122,7 +122,7 @@ MIL << "creating PrimaryFileParser" << endl; Measure parse_primary_timer("primary.xml.gz parsing"); ResolvableConsumer store; - parser::yum::YUMParser parser( 0, store, &progress_function); + parser::yum::RepoParser parser( 0, store, &progress_function); parser.parse(argv[1]); parse_primary_timer.stop(); Modified: trunk/libzypp/devel/devel.dmacvicar/testbed.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/te… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/testbed.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/testbed.cc Sun Jun 17 18:05:12 2007 @@ -14,21 +14,103 @@ #include "zypp/repo/cached/RepoImpl.h" #include "zypp/data/ResolvableData.h" +#include "zypp/TmpPath.h" +#include "zypp/ProgressData.h" +#include "zypp/parser/yum/RepoParser.h" +#include "zypp/repo/yum/Downloader.h" + using namespace std; using namespace zypp; using namespace zypp::repo; using namespace zypp::repo::cached; +bool task_receiver( ProgressData::value_type v ) +{ + cout << "got ->" << v << endl; + return( v <= 100 ); // Abort if ( v > 100 ) +} + +struct ProgressDataWrapper +{ + ProgressDataWrapper( ProgressData &pd, + ProgressData::value_type percentage ) + : _percentage(percentage), + _last_value(0), + _pd(pd) + + { + + } + + bool operator()( ProgressData::value_type v ) + { + MIL << endl; + ProgressData::value_type increment = v - _last_value; + int real_increment = (int)((float)(_percentage*increment)/100); + MIL << "Value: " << v << ". Increment of " << increment << ". Real of " << real_increment << endl; + _last_value = v; + return _pd.incr(real_increment); + } + + ProgressData::value_type _percentage; + ProgressData::value_type _last_value; + ProgressData &_pd; +}; + +// task one is 80% +void small_task_one( ProgressData::ReceiverFnc rcv ) +{ + MIL << "Small task one" << endl; + ProgressData progress(100); + progress.sendTo(rcv); + progress.toMin(); + progress.set(10); + progress.set(20); + progress.set(30); + progress.set(40); + progress.set(70); + progress.toMax(); +} + +// task one is 20% +void small_task_two( ProgressData::ReceiverFnc rcv ) +{ + MIL << "Small task two" << endl; + ProgressData progress(100); + progress.sendTo(rcv); + progress.toMin(); + progress.set(10); + progress.set(20); + progress.set(70); + progress.toMax(); +} + + +void big_task( ProgressData::ReceiverFnc rcv ) +{ + ProgressData progress(100); + progress.sendTo(rcv); + progress.toMin(); + ProgressDataWrapper wrapper1( progress, 80 ); + small_task_one( wrapper1 ); + ProgressDataWrapper wrapper2( progress, 20 ); + small_task_two( wrapper2 ); + progress.toMax(); +} int main(int argc, char **argv) { try { - ZYpp::Ptr z = getZYpp(); + //ZYpp::Ptr z = getZYpp(); - z->initializeTarget("/"); - ResStore res = z->target()->resolvables(); - MIL << res.size() << " resolvables" << endl; + //z->initializeTarget("/"); +// filesystem::TmpDir tmpdir; +// yum::Downloader downloader(Url("http://ftp.gwdg.de/pub/suse/update/10.2"), "/"); +// downloader.download(tmpdir.path(), &yum_download_receiver); + big_task(&task_receiver); + //ResStore res = z->target()->resolvables(); + //MIL << res.size() << " resolvables" << endl; } catch ( const Exception &e ) Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=5761… ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Sun Jun 17 18:05:12 2007 @@ -15,6 +15,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/DefaultIntegral.h" #include "zypp/Fetcher.h" +#include "zypp/base/UserRequestException.h" using namespace std; @@ -52,7 +53,9 @@ void enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker ); void addCachePath( const Pathname &cache_dir ); void reset(); - void start( const Pathname &dest_dir, MediaSetAccess &media ); + void start( const Pathname &dest_dir, + MediaSetAccess &media, + const ProgressData::ReceiverFnc & progress_receiver ); /** Offer default Impl. */ static shared_ptr<Impl> nullimpl() @@ -99,8 +102,13 @@ _caches.push_back(cache_dir); } - void Fetcher::Impl::start( const Pathname &dest_dir, MediaSetAccess &media ) + void Fetcher::Impl::start( const Pathname &dest_dir, + MediaSetAccess &media, + const ProgressData::ReceiverFnc & progress_receiver ) { + ProgressData progress(_resources.size()); + progress.sendTo(progress_receiver); + for ( list<FetcherJob>::const_iterator it_res = _resources.begin(); it_res != _resources.end(); ++it_res ) { bool got_from_cache = false; @@ -201,6 +209,9 @@ { ZYPP_THROW(Exception("Unknown error while validating " + (*it_res).location.filename().asString())); } + + if ( ! progress.incr() ) + ZYPP_THROW(AbortRequestException()); } // for each job } @@ -253,9 +264,11 @@ _pimpl->reset(); } - void Fetcher::start( const Pathname &dest_dir, MediaSetAccess &media ) + void Fetcher::start( const Pathname &dest_dir, + MediaSetAccess &media, + const ProgressData::ReceiverFnc & progress_receiver ) { - _pimpl->start(dest_dir, media); + _pimpl->start(dest_dir, media, progress_receiver); } Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=5761&… ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Sun Jun 17 18:05:12 2007 @@ -22,6 +22,7 @@ #include "zypp/Digest.h" #include "zypp/MediaSetAccess.h" #include "zypp/FileChecker.h" +#include "zypp/ProgressData.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -112,7 +113,9 @@ * directory * */ - void start( const Pathname &dest_dir, MediaSetAccess &media ); + void start( const Pathname &dest_dir, + MediaSetAccess &media, + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); private: /** Pointer to implementation */ 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 Sun Jun 17 18:05:12 2007 @@ -44,6 +44,24 @@ namespace zypp { ///////////////////////////////////////////////////////////////// +// class SubJobReceiverFnc +// { +// SubJobReceiverFnc( ProgressData::value_type jobtotal, const ProgressData::ReceiverFnc &receiver ) +// : _jobtotal(jobtotal) +// , _receiver(receiver) +// { +// +// } +// +// bool operator()( ProgressData::value_type progress ) +// { +// return true; +// } +// +// ProgressData::value_type _jobtotal; +// ProgressData::ReceiverFnc _receiver; +// }; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoManagerOptions @@ -59,8 +77,15 @@ } /** - * \short Simple callback to collect the results - */ + * \short Simple callback to collect the results + * + * Classes like RepoFileParser call the callback + * once per each repo in a file. + * + * Passing this functor as callback, you can collect + * all resuls at the end, without dealing with async + * code. + */ struct RepoCollector { RepoCollector() @@ -246,7 +271,8 @@ //////////////////////////////////////////////////////////////////////////// - void RepoManager::refreshMetadata( const RepoInfo &info ) + void RepoManager::refreshMetadata( const RepoInfo &info, + const ProgressData::ReceiverFnc & progress ) { assert_alias(info); assert_urls(info); @@ -305,14 +331,16 @@ //////////////////////////////////////////////////////////////////////////// - void RepoManager::cleanMetadata( const RepoInfo &info ) + void RepoManager::cleanMetadata( const RepoInfo &info, + const ProgressData::ReceiverFnc & progress ) { filesystem::recursive_rmdir(rawcache_path_for_repoinfo(_pimpl->options, info)); } //////////////////////////////////////////////////////////////////////////// - void RepoManager::buildCache( const RepoInfo &info ) + void RepoManager::buildCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progress ) { assert_alias(info); Pathname rawpath = rawcache_path_for_repoinfo(_pimpl->options, info); @@ -381,8 +409,12 @@ //////////////////////////////////////////////////////////////////////////// - void RepoManager::cleanCache( const RepoInfo &info ) + void RepoManager::cleanCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv ) { + ProgressData progress; + progress.sendTo(progressrcv); + cache::CacheStore store(_pimpl->options.repoCachePath); data::RecordId id = store.lookupRepository(info.alias()); @@ -398,7 +430,8 @@ return store.isCached(info.alias()); } - Repository RepoManager::createFromCache( const RepoInfo &info ) + Repository RepoManager::createFromCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progress ) { cache::CacheStore store(_pimpl->options.repoCachePath); @@ -417,9 +450,10 @@ //////////////////////////////////////////////////////////////////////////// - void RepoManager::addRepository( const RepoInfo &info ) + void RepoManager::addRepository( const RepoInfo &info, + const ProgressData::ReceiverFnc & progress ) { - + } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=5… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Sun Jun 17 18:05:12 2007 @@ -24,6 +24,7 @@ #include "zypp/RepoInfo.h" #include "zypp/repo/RepoException.h" #include "zypp/repo/RepoType.h" +#include "zypp/ProgressData.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -91,7 +92,8 @@ * \throws repo::RepoUnknownTypeException if the metadata is unknown * \throws Exception on unknown error. */ - void refreshMetadata( const RepoInfo &info ); + void refreshMetadata( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short Clean local metadata @@ -101,7 +103,8 @@ * \throws repo::RepoNoAliasException if can't figure an alias * \throws Exception on unknown error. */ - void cleanMetadata( const RepoInfo &info ); + void cleanMetadata( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short Refresh local cache @@ -116,7 +119,8 @@ * \throws repo::RepoNoAliasException if can't figure an alias to look in cache * \throws Exception on unknown error. */ - void buildCache( const RepoInfo &info ); + void buildCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short clean local cache @@ -128,7 +132,8 @@ * \throws repo::RepoNoAliasException if can't figure an alias to look in cache * \throws Exception on unknown error. */ - void cleanCache( const RepoInfo &info ); + void cleanCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short Whether a repository exists in cache @@ -142,7 +147,8 @@ * * \throw RepoNotCachedException When the source is not cached. */ - Repository createFromCache( const RepoInfo &info ); + Repository createFromCache( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short Probe repo metadata type. @@ -160,7 +166,8 @@ * \throws repo::RepoAlreadyExistsException If the repo clash some * unique attribute like alias */ - void addRepository( const RepoInfo &info ); + void addRepository( const RepoInfo &info, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * Adds a .repo file directly, which can contain @@ -171,7 +178,8 @@ /** * PROPOSAL */ - void removeRepository( const std::string & alias ); + void removeRepository( const std::string & alias, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); public: Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Sun Jun 17 18:05:12 2007 @@ -751,7 +751,8 @@ return id; } -void CacheStore::cleanRepository( const data::RecordId &id ) +void CacheStore::cleanRepository( const data::RecordId &id, + const ProgressData::ReceiverFnc & progressrcv ) { sqlite3_command cmd( _pimpl->con, "delete from repositories where id=:id"); cmd.bind(":id", id); @@ -766,9 +767,10 @@ } } -void CacheStore::cleanRepository( const std::string &alias ) +void CacheStore::cleanRepository( const std::string &alias, + const ProgressData::ReceiverFnc & progressrcv ) { - cleanRepository(lookupRepository(alias)); + cleanRepository(lookupRepository(alias), progressrcv); } RepoStatus CacheStore::repositoryStatus( const data::RecordId &id ) Modified: trunk/libzypp/zypp/cache/CacheStore.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.h?… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.h (original) +++ trunk/libzypp/zypp/cache/CacheStore.h Sun Jun 17 18:05:12 2007 @@ -27,6 +27,7 @@ #include "zypp/base/PtrTypes.h" #include "zypp/RepoStatus.h" +#include "zypp/ProgressData.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -356,7 +357,8 @@ * \param prpm The patch RPM object to insert. * \return Record ID of the newly inserted record. */ - data::RecordId appendPatchRpm( const data::RecordId &repo_id, const data::PatchRpm_Ptr & prpm); + data::RecordId appendPatchRpm( const data::RecordId &repo_id, + const data::PatchRpm_Ptr & prpm); /** @@ -365,7 +367,8 @@ * \param drpm The delta RPM object to insert. * \return Record ID of the newly inserted record. */ - data::RecordId appendDeltaRpm( const data::RecordId &repo_id, const data::DeltaRpm_Ptr & drpm); + data::RecordId appendDeltaRpm( const data::RecordId &repo_id, + const data::DeltaRpm_Ptr & drpm); /** @@ -540,7 +543,8 @@ * \throws CacheRecordNotFoundException if the repository * id does not refer to a valid repository. */ - void cleanRepository( const data::RecordId &id ); + void cleanRepository( const data::RecordId &id, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * \short Clean repository from cache @@ -552,7 +556,8 @@ * \throws CacheRecordNotFoundException if the repository * alias does not refer to a valid repository. */ - void cleanRepository( const std::string &alias ); + void cleanRepository( const std::string &alias, + const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** * get the status of a cached repository Modified: trunk/libzypp/zypp/repo/susetags/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downl… ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.cc Sun Jun 17 18:05:12 2007 @@ -6,6 +6,7 @@ #include "zypp/Fetcher.h" #include "zypp/repo/susetags/Downloader.h" +#include "zypp/base/UserRequestException.h" using namespace std; @@ -22,7 +23,8 @@ } -void Downloader::download( const Pathname &dest_dir ) +void Downloader::download( const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progress ) { MediaSetAccess media(_url, _path); Fetcher fetcher; Modified: trunk/libzypp/zypp/repo/susetags/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/susetags/Downl… ============================================================================== --- trunk/libzypp/zypp/repo/susetags/Downloader.h (original) +++ trunk/libzypp/zypp/repo/susetags/Downloader.h Sun Jun 17 18:05:12 2007 @@ -12,6 +12,7 @@ #include "zypp/Url.h" #include "zypp/Pathname.h" +#include "zypp/ProgressData.h" namespace zypp { @@ -24,7 +25,8 @@ { public: Downloader( const Url &url, const Pathname &path ); - void download( const Pathname &dest_dir ); + void download( const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); private: Url _url; Pathname _path; Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader… ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Sun Jun 17 18:05:12 2007 @@ -17,6 +17,7 @@ #include "zypp/parser/yum/RepomdFileReader.h" #include "zypp/parser/yum/PatchesFileReader.h" #include "Downloader.h" +#include "zypp/base/UserRequestException.h" using namespace std; using namespace zypp::xml; @@ -68,13 +69,17 @@ return true; } -void Downloader::download( const Pathname &dest_dir ) +void Downloader::download( const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progressrcv ) { Pathname repomdpath = "/repodata/repomd.xml"; Pathname keypath = "/repodata/repomd.xml.key"; Pathname sigpath = "/repodata/repomd.xml.asc"; - + ProgressData progress; + progress.sendTo(progressrcv); + progress.toMin(); + _dest_dir = dest_dir; if ( _media.doesFileExist(keypath) ) _fetcher.enqueue( OnMediaLocation().filename(keypath) ); @@ -84,6 +89,9 @@ _fetcher.start( dest_dir, _media ); + if ( ! progress.tick() ) + ZYPP_THROW(AbortRequestException()); + SignatureFileChecker sigchecker; if ( PathInfo( dest_dir + sigpath ).isExist() ) @@ -95,7 +103,9 @@ _fetcher.enqueue( OnMediaLocation().filename(repomdpath), sigchecker ); _fetcher.start( dest_dir, _media); - + if ( ! progress.tick() ) + ZYPP_THROW(AbortRequestException()); + _fetcher.reset(); Reader reader( dest_dir + "/repodata/repomd.xml" ); @@ -103,6 +113,7 @@ // ready, go! _fetcher.start( dest_dir, _media); + progress.toMax(); } }// ns yum Modified: trunk/libzypp/zypp/repo/yum/Downloader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader… ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.h (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.h Sun Jun 17 18:05:12 2007 @@ -17,6 +17,7 @@ #include "zypp/MediaSetAccess.h" #include "zypp/parser/xml/Reader.h" #include "zypp/repo/yum/ResourceType.h" +#include "zypp/ProgressData.h" namespace zypp { @@ -44,7 +45,8 @@ /** * starts the download to local directory \a dest_dir */ - void download( const Pathname &dest_dir ); + void download( const Pathname &dest_dir, + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); protected: bool repomd_Callback( const OnMediaLocation &loc, const ResourceType &dtype ); -- 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] r5760 - in /trunk/zypper/po: POTFILES.in createPot
by jkupec＠svn.opensuse.org 15 Jun '07

15 Jun '07

Author: jkupec Date: Fri Jun 15 16:27:30 2007 New Revision: 5760 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5760&view=rev Log: reintroduced and updated POTFILES.in (because of source files order) Added: trunk/zypper/po/POTFILES.in Modified: trunk/zypper/po/createPot Added: trunk/zypper/po/POTFILES.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/POTFILES.in?rev=5760&v… ============================================================================== --- trunk/zypper/po/POTFILES.in (added) +++ trunk/zypper/po/POTFILES.in Fri Jun 15 16:27:30 2007 @@ -0,0 +1,32 @@ +# List of source files which contain translatable strings. +../src/zypper-keyring-callbacks.h +../src/zypper-misc.cc +../src/zypper-sources.cc +../src/zypper.h +../src/zypp-checkpatches.cc +../src/zypper-callbacks.cc +../src/zypper-getopt.cc +../src/zypper-info.cc +../src/zypper-search.cc +../src/zypper.cc +../src/zypper-tabulator.h +../src/zypper-sources.h +../src/AliveCursor.h +../src/zypper-info.h +../src/zypper-misc.h +../src/zypper-utils.cc +../src/zypper-updates.h +../src/zypper-tabulator.cc +../src/zypper-command.cc +../src/zypper-callbacks.h +../src/zypp-checkpatches-wrapper.c +../src/zypper-utils.h +../src/zypper-media-callbacks.h +../src/zypper-source-callbacks.h +../src/zypper-updates.cc +../src/zypper-command.h +../src/zypper-rpm-callbacks.h +../src/zypper-getopt.h +../src/zypper-search.h +../src/checkpatches-keyring-callbacks.h + Modified: trunk/zypper/po/createPot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/createPot?rev=5760&r1=… ============================================================================== --- trunk/zypper/po/createPot (original) +++ trunk/zypper/po/createPot Fri Jun 15 16:27:30 2007 @@ -1,9 +1,7 @@ #!/bin/bash # search for sourcecode-files -SRCFILES=$(find .. -type f -name "*.h" \ --o -name "*.c" \ --o -name "*.cc") -echo $SRCFILES +SRCFILES=$(cat POTFILES.in | grep -v -P '#.+') + #calling xgettext with the sourcefiles xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0