diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-16 22:47:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-16 22:47:55 +0000 |
| commit | 476f06d82b3a199f651b89b83779c723a6980c2b (patch) | |
| tree | 42511eea224e65e7cb1e3f6fab58b2e36c412ffb /pym/portage | |
| parent | acbf44ae32b2e30a472accce4bd416db45355207 (diff) | |
| download | portage-476f06d82b3a199f651b89b83779c723a6980c2b.tar.gz portage-476f06d82b3a199f651b89b83779c723a6980c2b.tar.bz2 portage-476f06d82b3a199f651b89b83779c723a6980c2b.zip | |
Bug #266454 - Make @world an all-inclusive set once again, like it was prior
to portage-2.2_rc* releases. In addition to @system, @world now includes a
@selected set which represents user-selected "world" packages and sets that
saved in /var/lib/portage/world{,sets}.
svn path=/main/trunk/; revision=14614
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/sets/files.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py index e8650becd..f4b35037e 100644 --- a/pym/portage/sets/files.py +++ b/pym/portage/sets/files.py @@ -21,7 +21,7 @@ from portage.env.loaders import ItemFileLoader, KeyListFileLoader from portage.env.validators import ValidAtomValidator from portage import dep_getkey, cpv_getkey -__all__ = ["StaticFileSet", "ConfigFileSet", "WorldSet"] +__all__ = ["StaticFileSet", "ConfigFileSet", "WorldSelectedSet"] class StaticFileSet(EditablePackageSet): _operations = ["merge", "unmerge"] @@ -205,11 +205,11 @@ class ConfigFileSet(PackageSet): return rValue multiBuilder = classmethod(multiBuilder) -class WorldSet(EditablePackageSet): +class WorldSelectedSet(EditablePackageSet): description = "Set of packages that were directly installed by the user" def __init__(self, root): - super(WorldSet, self).__init__() + super(WorldSelectedSet, self).__init__() # most attributes exist twice as atoms and non-atoms are stored in # separate files self._lock = None @@ -324,5 +324,5 @@ class WorldSet(EditablePackageSet): self.replace(newworldlist) def singleBuilder(self, options, settings, trees): - return WorldSet(settings["ROOT"]) + return WorldSelectedSet(settings["ROOT"]) singleBuilder = classmethod(singleBuilder) |