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

pkg_info() phase. (trunk r8526)

svn path=/main/branches/2.1.2/; revision=8568

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3a8320b38ad28969c54ae3c0b398488ffd703b70..3af1f4dbde4a510d38cc09ed8d03330f9efe9c80 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1777,8 +1777,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.py b/pym/portage.py
index 2a28c52b729020c1fdf8372783d4dfc6f1b5940c..bf4aacdd533f1110ad25081d33c1f1edc3f2b095 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4094,7 +4094,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