From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] portage r15744 - main/trunk/pym/portage/package/ebuild
Date: Thu, 04 Mar 2010 07:11:59 +0000 [thread overview]
Message-ID: <E1Nn5Dz-00074Q-W7@stork.gentoo.org> (raw)
Author: zmedico
Date: 2010-03-04 07:11:59 +0000 (Thu, 04 Mar 2010)
New Revision: 15744
Modified:
main/trunk/pym/portage/package/ebuild/doebuild.py
main/trunk/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.
Modified: main/trunk/pym/portage/package/ebuild/doebuild.py
===================================================================
--- main/trunk/pym/portage/package/ebuild/doebuild.py 2010-03-04 06:57:52 UTC (rev 15743)
+++ main/trunk/pym/portage/package/ebuild/doebuild.py 2010-03-04 07:11:59 UTC (rev 15744)
@@ -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/trunk/pym/portage/package/ebuild/fetch.py
===================================================================
--- main/trunk/pym/portage/package/ebuild/fetch.py 2010-03-04 06:57:52 UTC (rev 15743)
+++ main/trunk/pym/portage/package/ebuild/fetch.py 2010-03-04 07:11:59 UTC (rev 15744)
@@ -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 = (
reply other threads:[~2010-03-04 7:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Nn5Dz-00074Q-W7@stork.gentoo.org \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox