| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-21 17:04:45 +0000 (Thu, 21 Feb 2008) |
| 3 |
New Revision: 1323 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/chroot-functions.sh |
| 8 |
Log: |
| 9 |
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. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-02-21 16:01:41 UTC (rev 1322) |
| 14 |
+++ trunk/ChangeLog 2008-02-21 17:04:45 UTC (rev 1323) |
| 15 |
@@ -1,6 +1,11 @@ |
| 16 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 17 |
# $Id: $ |
| 18 |
|
| 19 |
+ 21 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 20 |
+ targets/support/chroot-functions.sh: |
| 21 |
+ OK, we shouldn't use which to find env-update, since /usr/sbin isn't in the |
| 22 |
+ PATH by default. Instead, simply check if it exists. |
| 23 |
+ |
| 24 |
21 Feb 2008; Andrew Gaffney <agaffney@g.o> |
| 25 |
targets/support/chroot-functions.sh: |
| 26 |
Remove temporary package listing code, since --verbose is forced on with |
| 27 |
|
| 28 |
Modified: trunk/targets/support/chroot-functions.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/support/chroot-functions.sh 2008-02-21 16:01:41 UTC (rev 1322) |
| 31 |
+++ trunk/targets/support/chroot-functions.sh 2008-02-21 17:04:45 UTC (rev 1323) |
| 32 |
@@ -214,15 +214,7 @@ |
| 33 |
} |
| 34 |
|
| 35 |
update_env_settings(){ |
| 36 |
- which env-update > /dev/null 2>&1 |
| 37 |
- ret=$? |
| 38 |
- if [ $ret -eq 0 ] |
| 39 |
- then |
| 40 |
- ENV_UPDATE=`which env-update` |
| 41 |
- ${ENV_UPDATE} |
| 42 |
- else |
| 43 |
- echo "WARNING: env-update not found, skipping!" |
| 44 |
- fi |
| 45 |
+ [ -x /usr/sbin/env-update ] && /usr/sbin/env-update |
| 46 |
source /etc/profile |
| 47 |
[ -f /tmp/envscript ] && source /tmp/envscript |
| 48 |
} |
| 49 |
@@ -285,6 +277,7 @@ |
| 50 |
# TODO: grab our entire env |
| 51 |
# <zmedico> to get see the ebuild env you can do something like: |
| 52 |
# `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc |
| 53 |
+ # XXX: Also, portageq does *not* source profile.bashrc at any time. |
| 54 |
echo |
| 55 |
echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" |
| 56 |
echo |
| 57 |
|
| 58 |
-- |
| 59 |
gentoo-commits@l.g.o mailing list |
Archives