diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-10 01:58:52 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-10 01:58:52 +0000 |
commit | 95cc5f51d17066b6abea5dccce9713878efd106d (patch) | |
tree | 97e60ca514c665fecf14f0989173f9ad5860d7ce /pym/_emerge | |
parent | a712c083a80b6d3875c4675b912d3388b89fe855 (diff) | |
download | portage-95cc5f51d17066b6abea5dccce9713878efd106d.tar.gz portage-95cc5f51d17066b6abea5dccce9713878efd106d.tar.bz2 portage-95cc5f51d17066b6abea5dccce9713878efd106d.zip |
Fix _set module imports for rename, add hardcoded config for system and world,
and remove unused sets code.
svn path=/main/branches/2.1.7/; revision=14540
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BlockerDB.py | 2 | ||||
-rw-r--r-- | pym/_emerge/Scheduler.py | 4 | ||||
-rw-r--r-- | pym/_emerge/SetArg.py | 2 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 4 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 4 | ||||
-rw-r--r-- | pym/_emerge/main.py | 2 | ||||
-rw-r--r-- | pym/_emerge/unmerge.py | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 8367ec651..ff1e525a2 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -7,7 +7,7 @@ import sys import portage from portage import os from portage import digraph -from portage.sets.base import InternalPackageSet +from portage._sets.base import InternalPackageSet from _emerge.BlockerCache import BlockerCache from _emerge.FakeVartree import FakeVartree diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index f2247578b..0a9e87096 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -19,8 +19,8 @@ from portage.cache.mappings import slot_dict_class from portage.elog.messages import eerror from portage.output import colorize, create_color_func, darkgreen, red bad = create_color_func("BAD") -from portage.sets import SETPREFIX -from portage.sets.base import InternalPackageSet +from portage._sets import SETPREFIX +from portage._sets.base import InternalPackageSet from portage.util import writemsg, writemsg_level from _emerge.BinpkgPrefetcher import BinpkgPrefetcher diff --git a/pym/_emerge/SetArg.py b/pym/_emerge/SetArg.py index 987965dba..949bd6f7b 100644 --- a/pym/_emerge/SetArg.py +++ b/pym/_emerge/SetArg.py @@ -3,7 +3,7 @@ # $Id$ from _emerge.DependencyArg import DependencyArg -from portage.sets import SETPREFIX +from portage._sets import SETPREFIX class SetArg(DependencyArg): def __init__(self, set=None, **kwargs): DependencyArg.__init__(self, **kwargs) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index eaf31b970..cb29dd1c9 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -30,8 +30,8 @@ from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ red, yellow good = create_color_func("GOOD") bad = create_color_func("BAD") -from portage.sets import load_default_config, SETPREFIX -from portage.sets.base import InternalPackageSet +from portage._sets import load_default_config, SETPREFIX +from portage._sets.base import InternalPackageSet from portage.util import cmp_sort_key, writemsg, writemsg_level from _emerge.clear_caches import clear_caches diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 4a178a04e..9938a72c6 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -18,8 +18,8 @@ from portage.dep import Atom from portage.output import bold, blue, colorize, create_color_func, darkblue, \ darkgreen, green, nc_len, red, teal, turquoise, yellow bad = create_color_func("BAD") -from portage.sets import SETPREFIX -from portage.sets.base import InternalPackageSet +from portage._sets import SETPREFIX +from portage._sets.base import InternalPackageSet from portage.util import cmp_sort_key, writemsg, writemsg_stdout from portage.util import writemsg_level diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 22e00819b..40e0bcf2c 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -33,7 +33,7 @@ import portage.exception from portage.data import secpass from portage.util import normalize_path as normpath from portage.util import writemsg, writemsg_level, writemsg_stdout -from portage.sets import SETPREFIX +from portage._sets import SETPREFIX from _emerge.actions import action_config, action_sync, action_metadata, \ action_regen, action_search, action_uninstall, action_info, action_build, \ diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 4d2a546c5..53699737e 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -10,7 +10,7 @@ import textwrap import portage from portage import os from portage.output import bold, colorize, darkgreen, green -from portage.sets import SETPREFIX +from portage._sets import SETPREFIX from portage.util import cmp_sort_key from _emerge.emergelog import emergelog @@ -281,7 +281,7 @@ def unmerge(root_config, myopts, unmerge_action, vartree.dbapi.flush_cache() portage.locks.unlockdir(vdb_lock) - from portage.sets.base import EditablePackageSet + from portage._sets.base import EditablePackageSet # generate a list of package sets that are directly or indirectly listed in "world", # as there is no persistent list of "installed" sets |