diff options
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 6 | ||||
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 8 | ||||
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 20 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 26 | ||||
| -rw-r--r-- | pym/portage/dbapi/virtual.py | 3 |
5 files changed, 35 insertions, 28 deletions
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index c6067fd49..b4ec89e53 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -1,7 +1,9 @@ -from portage import dep_expand, dep_getkey, match_from_list, writemsg -from portage.dep import dep_getslot +from portage.dep import dep_getslot, dep_getkey, match_from_list from portage.locks import unlockfile from portage.output import red +from portage.util import writemsg + +from portage import dep_expand import os, re diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index a871dde8e..a30d7f860 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -1,10 +1,12 @@ +from portage.dep import isvalidatom, isjustname, dep_getkey, match_from_list from portage.dbapi.virtual import fakedbapi from portage.exception import InvalidPackageName, InvalidAtom from portage.output import green +from portage.util import normalize_path, writemsg, writemsg_stdout, best +from portage.versions import catpkgsplit, catsplit +from portage.update import update_dbentries -from portage import normalize_path, catpkgsplit, writemsg, writemsg_stdout, \ - update_dbentries, catsplit, isvalidatom, isjustname, catpkgsplit, listdir, \ - dep_getkey, dep_expand, match_from_list, best +from portage import listdir, dep_expand import portage.xpak, portage.getbinpkg diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 56ef8dbb8..7293b2e43 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -1,21 +1,21 @@ +from portage.cache.cache_errors import CacheError +from portage.const import REPO_NAME_LOC +from portage.data import portage_gid, secpass from portage.dbapi import dbapi -from portage.data import portage_gid -from portage.util import ensure_dirs, writemsg +from portage.dep import use_reduce, paren_reduce, dep_getslot, dep_getkey, \ + match_from_list, match_to_list from portage.exception import OperationNotPermitted, PortageException, \ UntrustedSignature, SecurityViolation, InvalidSignature, MissingSignature, \ FileNotFound -from portage.cache.cache_errors import CacheError -from portage import config, REPO_NAME_LOC, secpass -from portage.output import red from portage.manifest import Manifest -from portage.dep import use_reduce, paren_reduce, dep_getslot +from portage.output import red +from portage.util import ensure_dirs, writemsg, apply_recursive_permissions +from portage.versions import pkgsplit, catpkgsplit import portage.gpg, portage.checksum -from portage import eclass_cache, auxdbkeys, auxdbkeylen, \ - apply_recursive_permissions, pkgsplit, doebuild, flatten, listdir, \ - dep_expand, dep_getkey, catpkgsplit, match_from_list, match_to_list, \ - eapi_is_supported, key_expand, dep_check +from portage import eclass_cache, auxdbkeys, auxdbkeylen, doebuild, flatten, \ + listdir, dep_expand, eapi_is_supported, key_expand, dep_check, config import os, stat, sys diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a5b0eb8bb..1e2cceac5 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1,20 +1,22 @@ -from portage.dbapi import dbapi +from portage.checksum import perform_md5 from portage.const import VDB_PATH, CACHE_PATH +from portage.data import portage_gid, portage_uid +from portage.dbapi import dbapi +from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \ + isjustname, dep_getkey, match_from_list from portage.exception import InvalidPackageName, InvalidAtom, \ UnsupportedAPIException, FileNotFound -from portage.dep import dep_getslot, use_reduce, paren_reduce -from portage.util import apply_secpass_permissions, ConfigProtect, ensure_dirs -from portage.data import portage_gid, portage_uid from portage.locks import lockdir, unlockdir -from portage.checksum import perform_md5 from portage.output import red, green - -from portage import pkgsplit, write_atomic, writemsg, isvalidatom, isjustname, \ - catpkgsplit, writemsg_stdout, catsplit, fixdbentries, listdir, grabfile, \ - dep_getkey, dep_expand, match_from_list, atomic_ofstream, config, \ - flatten, key_expand, best, normalize_path, doebuild_environment, doebuild, \ - elog_process, env_update, dircache, grabdict, writedict, pkgcmp, abssymlink, \ - new_protect_filename, movefile, bsd_chflags +from portage.update import fixdbentries +from portage.util import apply_secpass_permissions, ConfigProtect, ensure_dirs, \ + writemsg, writemsg_stdout, write_atomic, atomic_ofstream, writedict, \ + grabfile, grabdict, normalize_path, new_protect_filename +from portage.versions import pkgsplit, catpkgsplit, catsplit, best, pkgcmp + +from portage import listdir, dep_expand, config, flatten, key_expand, \ + doebuild_environment, doebuild, elog_process, env_update, dircache, \ + abssymlink, movefile, bsd_chflags import os, sys, stat, cPickle, errno, commands, copy, time from itertools import izip diff --git a/pym/portage/dbapi/virtual.py b/pym/portage/dbapi/virtual.py index 0becd1e6c..760bf81a0 100644 --- a/pym/portage/dbapi/virtual.py +++ b/pym/portage/dbapi/virtual.py @@ -1,6 +1,7 @@ -from portage import cpv_getkey from portage.dbapi import dbapi +from portage import cpv_getkey + class fakedbapi(dbapi): "This is a dbapi to use for the emptytree function. It's empty, but things can be added to it." def __init__(self, settings=None): |