diff options
| author | Marius Mauch <genone@gentoo.org> | 2008-05-02 04:17:52 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2008-05-02 04:17:52 +0000 |
| commit | 37a999b34539547395dc86c6a6e2e3095fc4f800 (patch) | |
| tree | 37214a1eb47c7fcc1b7acf978047785e18bf8f53 /pym/portage | |
| parent | 8d2dd63139cb96dacfcce6c49bf19a20f7ef6ee4 (diff) | |
| download | portage-37a999b34539547395dc86c6a6e2e3095fc4f800.tar.gz portage-37a999b34539547395dc86c6a6e2e3095fc4f800.tar.bz2 portage-37a999b34539547395dc86c6a6e2e3095fc4f800.zip | |
add config option for package sets to not be recorded in 'world'
svn path=/main/trunk/; revision=10077
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/sets/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/sets/base.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index 554b534bc..d688164b5 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -67,6 +67,8 @@ class SetConfig(SafeConfigParser): if x in self.psets: self.errors.append("Redefinition of set '%s' (sections: '%s', '%s')" % (setname, self.psets[setname].creator, sname)) newsets[x].creator = sname + if self.has_option(sname, "world-candidate") and not self.getboolean(sname, "world-candidate"): + newsets[x].world_candidate = False self.psets.update(newsets) else: self.errors.append("Section '%s' is configured as multiset, but '%s' doesn't support that configuration" % (sname, classname)) @@ -82,6 +84,8 @@ class SetConfig(SafeConfigParser): try: self.psets[setname] = setclass.singleBuilder(optdict, self.settings, self.trees) self.psets[setname].creator = sname + if self.has_option(sname, "world-candidate") and not self.getboolean(sname, "world-candidate"): + self.psets[setname].world_candidate = False except SetConfigError, 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 50702cff3..d64b632f9 100644 --- a/pym/portage/sets/base.py +++ b/pym/portage/sets/base.py @@ -24,6 +24,7 @@ class PackageSet(object): self._loading = False self.errors = [] self._nonatoms = set() + self.world_candidate = True def __contains__(self, atom): self._load() |