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