Author: dmacvicar Date: Fri Jul 27 13:30:41 2007 New Revision: 6248 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6248&view=rev Log: zconfig: default* -> *, they are not default anymore as the user can set them in the conf file Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/TranslatedText.cc trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h trunk/libzypp/zypp/parser/susetags/RepoParser.cc Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=6248&r1=6247&r2=6248&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Fri Jul 27 13:30:41 2007 @@ -57,9 +57,9 @@ RepoManagerOptions::RepoManagerOptions() { - repoCachePath = ZConfig::instance().defaultRepoCachePath(); - repoRawCachePath = ZConfig::instance().defaultRepoMetadataPath(); - knownReposPath = ZConfig::instance().defaultKnownReposPath(); + repoCachePath = ZConfig::instance().repoCachePath(); + repoRawCachePath = ZConfig::instance().repoMetadataPath(); + knownReposPath = ZConfig::instance().knownReposPath(); } //////////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/TranslatedText.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/TranslatedText.cc?rev=6248&r1=6247&r2=6248&view=diff ============================================================================== --- trunk/libzypp/zypp/TranslatedText.cc (original) +++ trunk/libzypp/zypp/TranslatedText.cc Fri Jul 27 13:30:41 2007 @@ -52,7 +52,7 @@ Locale toReturn( lang ); if ( lang == Locale::noCode ) { - toReturn = ZConfig::instance().defaultTextLocale(); + toReturn = ZConfig::instance().textLocale(); } do Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=6248&r1=6247&r2=6248&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Fri Jul 27 13:30:41 2007 @@ -151,24 +151,24 @@ // METHOD NAME : ZConfig::defaultTextLocale // METHOD TYPE : Locale // - Locale ZConfig::defaultTextLocale() const + Locale ZConfig::textLocale() const { return getZYpp()->getTextLocale(); } - Pathname ZConfig::defaultRepoMetadataPath() const + Pathname ZConfig::repoMetadataPath() const { return ( _pimpl->cfg_metadata_path.empty() ? Pathname("/var/cache/zypp/raw") : _pimpl->cfg_metadata_path ); } - Pathname ZConfig::defaultRepoCachePath() const + Pathname ZConfig::repoCachePath() const { return ( _pimpl->cfg_cache_path.empty() ? Pathname("/var/cache/zypp") : _pimpl->cfg_cache_path ); } - Pathname ZConfig::defaultKnownReposPath() const + Pathname ZConfig::knownReposPath() const { return ( _pimpl->cfg_known_repos_path.empty() ? Pathname("/etc/zypp/repos.d") : _pimpl->cfg_known_repos_path ); Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=6248&r1=6247&r2=6248&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Fri Jul 27 13:30:41 2007 @@ -48,24 +48,24 @@ /** The prefered locale for translated labels, descriptions, * descriptions, etc. passed to the UI. */ - Locale defaultTextLocale() const; + Locale textLocale() const; /** * Path where the repo metadata is downloaded and kept. */ - Pathname defaultRepoMetadataPath() const; + Pathname repoMetadataPath() const; /** * Path where the processed cache is kept * (this is where zypp.db is located. */ - Pathname defaultRepoCachePath() const; + Pathname repoCachePath() const; /** * Path where the known repositories * .repo files are kept */ - Pathname defaultKnownReposPath() const; + Pathname knownReposPath() const; /** * Separator string for storing/reading sets of strings to/from Modified: trunk/libzypp/zypp/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/RepoParser.cc?rev=6248&r1=6247&r2=6248&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/susetags/RepoParser.cc (original) +++ trunk/libzypp/zypp/parser/susetags/RepoParser.cc Fri Jul 27 13:30:41 2007 @@ -396,7 +396,7 @@ parseLocaleIf( Locale("en") ); // For each wanted locale at least // some fallback, if locale is not present. - parseLocaleIf( ZConfig::instance().defaultTextLocale() ); + parseLocaleIf( ZConfig::instance().textLocale() ); // Now process the rest of RepoIndex for ( RepoIndex::FileChecksumMap::const_iterator it = _repoIndex->metaFileChecksums.begin(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org