Merged from trunk -r15739:15750

   | 15743   | Bug #307707 - Fix fetch() to use the correct spawn function  |
   | zmedico | when calling nofetch.                                        |

   | 15744   | Fix imports doebuild_environment and prepare_build_dirs      |
   | zmedico | imports to import from the real location instead of          |
   |         | importing proxies.                                           |

   | 15745   | Bug #307723 - Define basestring for python3.                 |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=15753

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index e04f7eb157085b926c5232dff55e88e75a563859..f3699bc2a574be6056468690caface79f3b7751c 100644 (file)
--- 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 f6e03d5e652d64b19f4fa86fb3d7a47833b1171c..46525d04f94aa984e9059dd18da5d3fa83f77b0e 100644 (file)
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -20,19 +20,27 @@ import tempfile
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
        'portage.package.ebuild.config:check_config_instance,config',
+       '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.const import rootgid
 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 = (
@@ -1097,7 +1105,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        ebuild_phase = mysettings.get("EBUILD_PHASE")
                                        try:
                                                mysettings["EBUILD_PHASE"] = "nofetch"
-                                               spawn(_shell_quote(EBUILD_SH_BINARY) + \
+                                               doebuild_spawn(_shell_quote(EBUILD_SH_BINARY) + \
                                                        " nofetch", mysettings, fd_pipes=fd_pipes)
                                        finally:
                                                if ebuild_phase is None:

diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/pym/portage/package/ebuild/getmaskingstatus.py
index bfe92d824ea2c14a2259ff7a1197edbccbe0f696..a51332028f90ae7a673f24ef4083fefa919817f5 100644 (file)
--- a/pym/portage/package/ebuild/getmaskingstatus.py
+++ b/pym/portage/package/ebuild/getmaskingstatus.py
@@ -4,6 +4,8 @@
 
 __all__ = ['getmaskingstatus']
 
+import sys
+
 import portage
 from portage import eapi_is_supported, _eapi_is_deprecated
 from portage.dep import match_from_list
@@ -11,6 +13,9 @@ from portage.localization import _
 from portage.package.ebuild.config import config
 from portage.versions import catpkgsplit, cpv_getkey
 
+if sys.hexversion >= 0x3000000:
+       basestring = str
+
 def getmaskingstatus(mycpv, settings=None, portdb=None):
        if settings is None:
                settings = config(clone=portage.settings)