aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-30 00:16:50 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-30 00:16:50 -0700
commit25d8427b3b29cbcee97279186983dae818495f8f (patch)
tree36e05fdb10b3fc418686f59010ae4133428f7884 /bin
parentAlways check if vardbapi._linkmap and vardbapi._plib_registry are (diff)
downloadportage-25d8427b3b29cbcee97279186983dae818495f8f.tar.gz
portage-25d8427b3b29cbcee97279186983dae818495f8f.tar.bz2
portage-25d8427b3b29cbcee97279186983dae818495f8f.zip
Rename the portage.sets module to portage._sets since it will be useful
in the upcoming 2.1.9 branch which will not have sets support but will still have the code in private and disabled form.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emaint4
-rwxr-xr-xbin/quickpkg2
-rwxr-xr-xbin/regenworld2
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/emaint b/bin/emaint
index 6a73c6fe2..5ff60422c 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -32,7 +32,7 @@ class WorldHandler(object):
self.not_installed = []
self.invalid_category = []
self.okay = []
- from portage.sets import load_default_config
+ from portage._sets import load_default_config
setconfig = load_default_config(portage.settings,
portage.db[portage.settings["ROOT"]])
self._sets = setconfig.getSets()
@@ -44,7 +44,7 @@ class WorldHandler(object):
self.found = os.access(self.world_file, os.R_OK)
vardb = portage.db[myroot]["vartree"].dbapi
- from portage.sets import SETPREFIX
+ from portage._sets import SETPREFIX
sets = self._sets
world_atoms = list(sets["selected"])
maxval = len(world_atoms)
diff --git a/bin/quickpkg b/bin/quickpkg
index 042e98cc2..3e971f5d7 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -26,7 +26,7 @@ from portage.exception import InvalidAtom, InvalidData, InvalidDependString, Pac
from portage.util import ConfigProtect, ensure_dirs, shlex_split
from portage.dbapi.vartree import dblink, tar_contents
from portage.checksum import perform_md5
-from portage.sets import load_default_config, SETPREFIX
+from portage._sets import load_default_config, SETPREFIX
def quickpkg_atom(options, infos, arg, eout):
settings = portage.settings
diff --git a/bin/regenworld b/bin/regenworld
index c3e7f4470..292eac1ac 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -13,7 +13,7 @@ except ImportError:
import portage
from portage import os
-from portage.sets.files import StaticFileSet, WorldSelectedSet
+from portage._sets.files import StaticFileSet, WorldSelectedSet
import re
import tempfile