From cc049738accd00edfeea3ed1658b365a3635b0e0 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 21 Feb 2008 17:04:45 +0000 Subject: [PATCH] OK, we shouldn't use which to find env-update, since /usr/sbin isn't in the PATH by default. Instead, simply check if it exists. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1323 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/support/chroot-functions.sh | 11 ++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3553b22..3bc07b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 21 Feb 2008; Chris Gianelloni + targets/support/chroot-functions.sh: + OK, we shouldn't use which to find env-update, since /usr/sbin isn't in the + PATH by default. Instead, simply check if it exists. + 21 Feb 2008; Andrew Gaffney targets/support/chroot-functions.sh: Remove temporary package listing code, since --verbose is forced on with diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 89f0c964..e1c9bacf 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -214,15 +214,7 @@ cleanup_stages() { } update_env_settings(){ - which env-update > /dev/null 2>&1 - ret=$? - if [ $ret -eq 0 ] - then - ENV_UPDATE=`which env-update` - ${ENV_UPDATE} - else - echo "WARNING: env-update not found, skipping!" - fi + [ -x /usr/sbin/env-update ] && /usr/sbin/env-update source /etc/profile [ -f /tmp/envscript ] && source /tmp/envscript } @@ -285,6 +277,7 @@ show_debug() { # TODO: grab our entire env # to get see the ebuild env you can do something like: # `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc + # XXX: Also, portageq does *not* source profile.bashrc at any time. echo echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" echo -- 2.26.2