Author: jkupec Date: Mon Mar 10 12:44:51 2008 New Revision: 9068 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9068&view=rev Log: - clean also .cookie files - cleanTargetCache() added - use escaped_alias() in rawcache_path_for_repoinfo() and packagescache_path_for_repoinfo() 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=9068&r1=9067&r2=9068&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Mon Mar 10 12:44:51 2008 @@ -195,7 +195,7 @@ static Pathname rawcache_path_for_repoinfo( const RepoManagerOptions &opt, const RepoInfo &info ) { assert_alias(info); - return opt.repoRawCachePath + info.alias(); + return opt.repoRawCachePath / info.escaped_alias(); } /** @@ -204,7 +204,7 @@ static Pathname packagescache_path_for_repoinfo( const RepoManagerOptions &opt, const RepoInfo &info ) { assert_alias(info); - return opt.repoPackagesCachePath + info.alias(); + return opt.repoPackagesCachePath / info.escaped_alias(); } /////////////////////////////////////////////////////////////////// @@ -865,9 +865,21 @@ void RepoManager::cleanCache( const RepoInfo &info, const ProgressData::ReceiverFnc & progressrcv ) { - Pathname name = _pimpl->options.repoCachePath; - name += info.escaped_alias() + ".solv"; - unlink (name); + ProgressData progress(100); + progress.sendTo(progressrcv); + progress.toMin(); + + unlink (_pimpl->options.repoCachePath / (info.escaped_alias() + ".solv")); + progress.set(99); + unlink (_pimpl->options.repoCachePath / (info.escaped_alias() + ".cookie")); + + progress.toMax(); + } + + void RepoManager::cleanTargetCache(const ProgressData::ReceiverFnc & progressrcv) + { + unlink (_pimpl->options.repoCachePath / (sat::Pool::systemRepoName() + ".solv")); + unlink (_pimpl->options.repoCachePath / (sat::Pool::systemRepoName() + ".cookie")); } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=9068&r1=9067&r2=9068&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Mon Mar 10 12:44:51 2008 @@ -255,6 +255,11 @@ const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); /** + * Clean target system (rpm db) cache. + */ + void cleanTargetCache(const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc()); + + /** * \short Whether a repository exists in cache * * \param RepoInfo to be checked. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org