Author: jkupec Date: Wed May 28 16:25:45 2008 New Revision: 10256 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10256&view=rev Log: - RepoInfo: don't overwrite flags that have already been set externally (bnc #395026) Modified: trunk/libzypp/zypp/RepoInfo.cc Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=10256&r1=10255&r2=10256&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Wed May 28 16:25:45 2008 @@ -30,13 +30,21 @@ /** RepoInfo implementation. */ struct RepoInfo::Impl { + enum FlagsDeterminedState + { + FLAG_ENABLED = 1, + FLAG_AUTOREFRESH = 2, + FLAG_GPGCHECK = 4, + FLAG_KEEPPACKAGES = 8 + }; Impl() : enabled (false), autorefresh(false), gpgcheck(true), keeppackages(false), - type(repo::RepoType::NONE_e) + type(repo::RepoType::NONE_e), + flags_determined(0) {} ~Impl() @@ -73,6 +81,7 @@ Pathname metadatapath; Pathname packagespath; DefaultIntegral priority; + int flags_determined; public: private: @@ -128,18 +137,21 @@ RepoInfo & RepoInfo::setEnabled( bool enabled ) { _pimpl->enabled = enabled; + _pimpl->flags_determined |= Impl::FLAG_ENABLED; return *this; } RepoInfo & RepoInfo::setAutorefresh( bool autorefresh ) { _pimpl->autorefresh = autorefresh; + _pimpl->flags_determined |= Impl::FLAG_AUTOREFRESH; return *this; } RepoInfo & RepoInfo::setGpgCheck( bool check ) { _pimpl->gpgcheck = check; + _pimpl->flags_determined |= Impl::FLAG_GPGCHECK; return *this; } @@ -157,7 +169,8 @@ RepoInfo & RepoInfo::addBaseUrl( const Url &url ) { - if ( _pimpl->baseUrls.size()==0 ) //first url + // set only if not already set (bnc #394728) + if (!(_pimpl->flags_determined & Impl::FLAG_KEEPPACKAGES)) { if ( media::MediaAccess::downloads( url ) ) setKeepPackages(true); @@ -235,6 +248,7 @@ RepoInfo & RepoInfo::setKeepPackages( bool keep ) { _pimpl->keeppackages = keep; + _pimpl->flags_determined |= Impl::FLAG_KEEPPACKAGES; return *this; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org