From 3a372e3e28f111ea27e20124a0b800223e7dfffa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Nov 2007 06:09:11 +0000 Subject: [PATCH] Disable logging and ${T}/environment saving during the pkg_info() phase. svn path=/main/trunk/; revision=8526 --- bin/ebuild.sh | 3 +-- pym/portage/__init__.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index bbdc6606e..7c9123d8d 100755 --- 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 487dd6ba9..74a6d853c 100644 --- 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 -- 2.26.2