diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-10 00:08:13 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-10 00:08:13 +0000 |
commit | 4722f5ae2ecbd194ecc34c6365f64b2d6614295a (patch) | |
tree | a6ab7c1a68b74507a8532c423bb95f2353ebfc0a /bin | |
parent | 3f97da4a44583dc747043f0b973adca167051ba4 (diff) | |
download | portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.tar.gz portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.tar.bz2 portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.zip |
For bug #170178, remove all hardcoded references to '/usr/lib/portage'.
svn path=/main/trunk/; revision=6203
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/emerge-webrsync | 7 | ||||
-rwxr-xr-x | bin/etc-update | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 24fc377c2..7602deab5 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -5,8 +5,9 @@ # Author: Karl Trygve Kalleberg <karltk@gentoo.org> # Rewritten from the old, Perl-based emerge-webrsync script -eval $(/usr/lib/portage/bin/portageq envvar -v FEATURES FETCHCOMMAND \ - GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \ +type portageq > /dev/null || exit $? +eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ + PORTAGE_BIN_PATH PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \ PORTAGE_TMPDIR PORTDIR PORTAGE_RSYNC_EXTRA_OPTS) DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" @@ -16,7 +17,7 @@ if [ -n "${PORTAGE_NICENESS}" ]; then renice $PORTAGE_NICENESS $$ > /dev/null fi -source /usr/lib/portage/bin/isolated-functions.sh || exit 1 +source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 if [ ! -d $DISTDIR ] ; then mkdir -p $DISTDIR diff --git a/bin/etc-update b/bin/etc-update index c1569ff12..ab376b83c 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -439,8 +439,8 @@ scriptname=$(basename $0) trap die term - -eval $(/usr/lib/portage/bin/portageq envvar -v CONFIG_PROTECT \ +type portageq > /dev/null || exit $? +eval $(portageq envvar -v CONFIG_PROTECT \ CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND) export PORTAGE_TMPDIR |