diff options
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 | 8 | ||||
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/unmerge.py | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 8b2a22d8e..f671a58a7 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -6,7 +6,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 7db16088d..ee5b8a3d5 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -24,8 +24,8 @@ from portage.elog.messages import eerror from portage.localization import _ from portage.output import colorize, create_color_func, 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 portage.package.ebuild.digestcheck import digestcheck from portage.package.ebuild.digestgen import digestgen diff --git a/pym/_emerge/SetArg.py b/pym/_emerge/SetArg.py index e43ad5812..2941695a8 100644 --- a/pym/_emerge/SetArg.py +++ b/pym/_emerge/SetArg.py @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 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 99b2a469e..3c735aa2c 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -34,8 +34,8 @@ from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ good = create_color_func("GOOD") bad = create_color_func("BAD") from portage.package.ebuild._ipc.QueryCommand import QueryCommand -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, writemsg_stdout from portage._global_updates import _global_updates diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index cb9c5d4c0..25429601e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -24,8 +24,8 @@ from portage.output import bold, blue, colorize, create_color_func, darkblue, \ bad = create_color_func("BAD") from portage.package.ebuild.getmaskingstatus import \ _getmaskingstatus, _MaskReason -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 3bd72226f..19027ea47 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -32,7 +32,7 @@ from portage.data import secpass from portage.dbapi.dep_expand import dep_expand from portage.util import normalize_path as normpath from portage.util import shlex_split, writemsg_level, writemsg_stdout -from portage.sets import SETPREFIX +from portage._sets import SETPREFIX from portage._global_updates import _global_updates from _emerge.actions import action_config, action_sync, action_metadata, \ @@ -1001,9 +1001,9 @@ def ionice(settings): out.eerror("See the make.conf(5) man page for PORTAGE_IONICE_COMMAND usage instructions.") def setconfig_fallback(root_config): - from portage.sets.base import DummyPackageSet - from portage.sets.files import WorldSelectedSet - from portage.sets.profiles import PackagesSystemSet + from portage._sets.base import DummyPackageSet + from portage._sets.files import WorldSelectedSet + from portage._sets.profiles import PackagesSystemSet setconfig = root_config.setconfig setconfig.psets['world'] = DummyPackageSet(atoms=['@selected', '@system']) setconfig.psets['selected'] = WorldSelectedSet(root_config.settings['EROOT']) diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index c2156850e..1bde0bea4 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -5,7 +5,7 @@ from _emerge.Package import Package from _emerge.PackageArg import PackageArg from portage.dep import check_required_use from portage.output import colorize -from portage.sets.base import InternalPackageSet +from portage._sets.base import InternalPackageSet from portage.util import writemsg from portage.versions import cpv_getversion, vercmp diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 5b466e2d6..dc9030ea2 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -9,7 +9,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 "selected", # as there is no persistent list of "installed" sets |