Merged from trunk 9154:9158

   | 9155    | Bug #204753 - Add "distfiles" and "packages" to the list of  |
   | zmedico | non-category directories.                                    |

   | 9157    | When spawing the "depend" phase, use file descriptors from   |
   | zmedico | sys.std* streams.                                            |

   | 9158    | After loading the environment, make sure the color variables |
   | zmedico | are in sync with the current NOCOLOR setting.                |

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f6928fccd39034b86e17d617eb2f4edbba15c08a..6c748bdedc5eaaa9130fa8e2fa8bc2ea4010bca6 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1651,6 +1651,18 @@ if ! hasq ${EBUILD_PHASE} clean depend && \
        unset x y
        export SANDBOX_ON=${PORTAGE_SANDBOX_ON}
        unset PORTAGE_SANDBOX_ON
+
+       # After loading the environment, make sure the color variables
+       # are in sync with the current NOCOLOR setting.
+       case "${NOCOLOR:-false}" in
+               yes|true)
+                       unset_colors
+                       ;;
+               no|false)
+                       set_colors
+                       ;;
+       esac
+
        source_all_bashrcs
 fi
 

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4515b2d9ec1db939432178117ffa490bb18f1871..e22e8074c127a2f1d16cf349223cadc131ddd132 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4445,7 +4445,11 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        if isinstance(dbkey, dict):
                                mysettings["dbkey"] = ""
                                pr, pw = os.pipe()
-                               fd_pipes = {0:0, 1:1, 2:2, 9:pw}
+                               fd_pipes = {
+                                       0:sys.stdin.fileno(),
+                                       1:sys.stdout.fileno(),
+                                       2:sys.stderr.fileno(),
+                                       9:pw}
                                mypids = spawn(_shell_quote(ebuild_sh_binary) + " depend",
                                        mysettings,
                                        fd_pipes=fd_pipes, returnpid=True, droppriv=droppriv)

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 61ce3c47bc1b95c48c3f924b79bd21cc32f1099c..813d9229d734fda9101832a07f02624c3cd4f41c 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -27,8 +27,8 @@ from itertools import izip
 class portdbapi(dbapi):
        """this tree will scan a portage directory located at root (passed to init)"""
        portdbapi_instances = []
-       _non_category_dirs = ["eclass", "licenses",
-               "metadata", "profiles", "scripts"]
+       _non_category_dirs = ["distfiles", "eclass", "licenses",
+               "metadata", "packages", "profiles", "scripts"]
        _non_category_dirs = re.compile(r'^(%s)$' % "|".join(_non_category_dirs))
        def __init__(self, porttree_root, mysettings=None):
                portdbapi.portdbapi_instances.append(self)