summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-07-27 13:19:00 -0700
committerZac Medico <zmedico@gentoo.org>2010-07-27 13:19:00 -0700
commit53f820a855cc9c817424c4705ca6f7b72b63e31e (patch)
tree5bd15dcd1c1e441d894d0528e9af99e128910a59 /pym
parentb1692269047db9f6c59f5203629ab2fc68423086 (diff)
downloadportage-53f820a855cc9c817424c4705ca6f7b72b63e31e.tar.gz
portage-53f820a855cc9c817424c4705ca6f7b72b63e31e.tar.bz2
portage-53f820a855cc9c817424c4705ca6f7b72b63e31e.zip
Make the world-candidate package set attribute default to False, since
[usersets] is the only one for which it is True in the default config.
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/sets/__init__.py8
-rw-r--r--pym/portage/sets/base.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index ab9869cee..dc6661480 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -113,8 +113,8 @@ class SetConfig(object):
self.errors.append(_("Redefinition of set '%s' (sections: '%s', '%s')") % (x, self.psets[x].creator, sname))
newsets[x].creator = sname
if parser.has_option(sname, "world-candidate") and \
- not parser.getboolean(sname, "world-candidate"):
- newsets[x].world_candidate = False
+ parser.getboolean(sname, "world-candidate"):
+ newsets[x].world_candidate = True
self.psets.update(newsets)
else:
self.errors.append(_("Section '%(section)s' is configured as multiset, but '%(class)s' "
@@ -132,8 +132,8 @@ class SetConfig(object):
self.psets[setname] = setclass.singleBuilder(optdict, self.settings, self.trees)
self.psets[setname].creator = sname
if parser.has_option(sname, "world-candidate") and \
- not parser.getboolean(sname, "world-candidate"):
- self.psets[setname].world_candidate = False
+ parser.getboolean(sname, "world-candidate"):
+ self.psets[setname].world_candidate = True
except SetConfigError as e:
self.errors.append(_("Configuration error in section '%s': %s") % (sname, str(e)))
continue
diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py
index f54c5436f..f2e745157 100644
--- a/pym/portage/sets/base.py
+++ b/pym/portage/sets/base.py
@@ -26,7 +26,7 @@ class PackageSet(object):
self._loading = False
self.errors = []
self._nonatoms = set()
- self.world_candidate = True
+ self.world_candidate = False
def __contains__(self, atom):
self._load()