summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-04 07:11:59 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-04 07:11:59 +0000
commitb7671e57a3a718b4b7176ac0eae8c7d69daf3502 (patch)
tree9d048f648e90913e027464320a3623d42f1bed76
parent8a52e95fd3be42b3fa72263294437d2900014152 (diff)
downloadportage-b7671e57a3a718b4b7176ac0eae8c7d69daf3502.tar.gz
portage-b7671e57a3a718b4b7176ac0eae8c7d69daf3502.tar.bz2
portage-b7671e57a3a718b4b7176ac0eae8c7d69daf3502.zip
Fix imports doebuild_environment and prepare_build_dirs imports to import from
the real location instead of importing proxies. svn path=/main/trunk/; revision=15744
-rw-r--r--pym/portage/package/ebuild/doebuild.py2
-rw-r--r--pym/portage/package/ebuild/fetch.py17
2 files changed, 13 insertions, 6 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index d25ebb693..a381052a1 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -25,6 +25,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.package.ebuild.config:check_config_instance',
'portage.package.ebuild.digestcheck:digestcheck',
'portage.package.ebuild.digestgen:digestgen',
+ 'portage.package.ebuild.fetch:fetch',
'portage.util.ExtractKernelVersion:ExtractKernelVersion'
)
@@ -47,7 +48,6 @@ from portage.exception import DigestException, FileNotFound, \
from portage.localization import _
from portage.manifest import Manifest
from portage.output import style_to_ansi_code
-from portage.package.ebuild.fetch import fetch
from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs
from portage.util import apply_recursive_permissions, \
apply_secpass_permissions, noiselimit, normalize_path, \
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 353a4e678..04bb4f325 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -20,19 +20,26 @@ import tempfile
import portage
portage.proxy.lazyimport.lazyimport(globals(),
'portage.package.ebuild.config:check_config_instance,config',
- 'portage.package.ebuild.doebuild:spawn@doebuild_spawn',
+ 'portage.package.ebuild.doebuild:doebuild_environment,' + \
+ 'spawn@doebuild_spawn',
+ 'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
)
-from portage import doebuild_environment, OrderedDict, os, prepare_build_dirs, selinux, _encodings, _shell_quote, _unicode_encode
+from portage import OrderedDict, os, selinux, _encodings, \
+ _shell_quote, _unicode_encode
from portage.checksum import perform_md5, verify_all
-from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, EBUILD_SH_BINARY, GLOBAL_CONFIG_PATH
+from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
+ EBUILD_SH_BINARY, GLOBAL_CONFIG_PATH
from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
-from portage.exception import FileNotFound, OperationNotPermitted, PermissionDenied, PortageException, TryAgain
+from portage.exception import FileNotFound, OperationNotPermitted, \
+ PermissionDenied, PortageException, TryAgain
from portage.localization import _
from portage.locks import lockfile, unlockfile
from portage.manifest import Manifest
from portage.output import colorize, EOutput
-from portage.util import apply_recursive_permissions, apply_secpass_permissions, ensure_dirs, grabdict, shlex_split, varexpand, writemsg, writemsg_level, writemsg_stdout
+from portage.util import apply_recursive_permissions, \
+ apply_secpass_permissions, ensure_dirs, grabdict, shlex_split, \
+ varexpand, writemsg, writemsg_level, writemsg_stdout
from portage.process import spawn
_userpriv_spawn_kwargs = (