Disable logging and ${T}/environment saving during the

pkg_info() phase.

svn path=/main/trunk/; revision=8526

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bbdc6606e31115a88dbf8bdeaad00310e362998d..7c9123d8da7fbdda2bb6c1679a74490ebd844438 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1661,8 +1661,7 @@ done
 
 # Save the env only for relevant phases.
 if [ -n "${myarg}" ] && \
-       [ "${myarg}" != "clean" ] && \
-       [ "${myarg}" != "help" ] ; then
+       ! hasq ${myarg} clean help info ; then
        # Do not save myarg in the env, or else the above [ -n "$myarg" ] test will
        # give a false positive when ebuild.sh is sourced.
        unset myarg

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 487dd6ba93d1145167623bc678037edbb0883ee2..74a6d853c9c5f18ba418addd275edf6429f9b265 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4145,7 +4145,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 
                # Build directory creation isn't required for any of these.
                have_build_dirs = False
-               if mydo not in ("digest", "fetch", "help", "manifest"):
+               if mydo not in ("digest", "fetch", "help", "info", "manifest"):
                        mystatus = prepare_build_dirs(myroot, mysettings, cleanup)
                        if mystatus:
                                return mystatus