* [gentoo-commits] portage r15748 - main/branches/2.1.7/pym/portage/package/ebuild
@ 2010-03-04 11:23 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2010-03-04 11:23 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2010-03-04 11:23:00 +0000 (Thu, 04 Mar 2010)
New Revision: 15748
Modified:
main/branches/2.1.7/pym/portage/package/ebuild/doebuild.py
main/branches/2.1.7/pym/portage/package/ebuild/fetch.py
Log:
Fix imports doebuild_environment and prepare_build_dirs imports to import from
the real location instead of importing proxies. (trunk r15744)
Modified: main/branches/2.1.7/pym/portage/package/ebuild/doebuild.py
===================================================================
--- main/branches/2.1.7/pym/portage/package/ebuild/doebuild.py 2010-03-04 11:22:48 UTC (rev 15747)
+++ main/branches/2.1.7/pym/portage/package/ebuild/doebuild.py 2010-03-04 11:23:00 UTC (rev 15748)
@@ -25,6 +25,7 @@
'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.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, \
Modified: main/branches/2.1.7/pym/portage/package/ebuild/fetch.py
===================================================================
--- main/branches/2.1.7/pym/portage/package/ebuild/fetch.py 2010-03-04 11:22:48 UTC (rev 15747)
+++ main/branches/2.1.7/pym/portage/package/ebuild/fetch.py 2010-03-04 11:23:00 UTC (rev 15748)
@@ -20,19 +20,26 @@
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 = (
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-04 11:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04 11:23 [gentoo-commits] portage r15748 - main/branches/2.1.7/pym/portage/package/ebuild Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox