From fa5253f154551345ec901c2b4144ad5f1becf3b2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Nov 2007 04:13:17 +0000 Subject: Disable logging and ${T}/environment saving during the pkg_info() phase. (trunk r8526) svn path=/main/branches/2.1.2/; revision=8568 --- bin/ebuild.sh | 3 +-- pym/portage.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 3a8320b38..3af1f4dbd 100755 --- 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 2a28c52b7..bf4aacdd5 100644 --- 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 -- cgit v1.2.3-1-g7c22