summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2007-07-16 12:53:57 +0000
committerMarius Mauch <genone@gentoo.org>2007-07-16 12:53:57 +0000
commit28178b98c14bec7e02c16f5c0980a14574bba387 (patch)
treee3754db7d587c60cf0937656baf803e8035c01af
parentc025f5a7ac4da2a390a4b60a1af69a82df585d2d (diff)
downloadportage-28178b98c14bec7e02c16f5c0980a14574bba387.tar.gz
portage-28178b98c14bec7e02c16f5c0980a14574bba387.tar.bz2
portage-28178b98c14bec7e02c16f5c0980a14574bba387.zip
Replace emerge.SystemSet with portage.sets.profiles.PackagesSystemSet
svn path=/main/trunk/; revision=7281
-rw-r--r--pym/emerge/__init__.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index ab9b683c6..413316d12 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -53,6 +53,7 @@ from portage.data import secpass
from portage.util import normalize_path as normpath
from portage.util import writemsg
from portage.sets import InternalPackageSet
+from portage.sets.profiles import PackagesSystemSet as SystemSet
from itertools import chain, izip
from UserDict import DictMixin
@@ -592,11 +593,6 @@ def clean_world(vardb, cpv):
world_set.save()
world_set.unlock()
-class SystemSet(InternalPackageSet):
- def __init__(self, settings, **kwargs):
- InternalPackageSet.__init__(self, **kwargs)
- self.update(getlist(settings, "system"))
-
class WorldSet(InternalPackageSet):
def __init__(self, settings, **kwargs):
InternalPackageSet.__init__(self, **kwargs)
@@ -630,7 +626,7 @@ class RootConfig(object):
world_set = WorldSet(self.settings)
world_set.xload()
self.sets["world"] = world_set
- system_set = SystemSet(self.settings)
+ system_set = SystemSet("system", self.settings.profiles)
self.sets["system"] = system_set
def create_world_atom(pkg_key, metadata, args_set, root_config):
@@ -5295,7 +5291,7 @@ def action_depclean(settings, trees, ldpath_mtimes,
vardb = dep_check_trees[myroot]["vartree"].dbapi
# Constrain dependency selection to the installed packages.
dep_check_trees[myroot]["porttree"] = dep_check_trees[myroot]["vartree"]
- system_set = SystemSet(settings)
+ system_set = SystemSet("system", settings.profiles)
syslist = list(system_set)
world_set = WorldSet(settings)
world_set.xload()