From 5a10c3d351dbd92668d88afa9bd4bac24490b45d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 7 Sep 2006 07:01:09 +0000 Subject: Substitute isolated-functions.sh in place of /sbin/functions.sh. svn path=/main/trunk/; revision=4423 --- bin/quickpkg | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/quickpkg b/bin/quickpkg index 92c419929..e6bf9167b 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -17,7 +17,8 @@ fi # We need to ensure a sane umask for the packages that will be created. umask 022 -eval $(portageq envvar -v PKGDIR PORTAGE_PYM_PATH PORTAGE_TMPDIR ROOT) +eval $(portageq envvar -v NOCOLOR PKGDIR PORTAGE_BIN_PATH PORTAGE_NICENESS \ + PORTAGE_PYM_PATH PORTAGE_TMPDIR ROOT) export PKGDIR PORTAGE_TMPDIR ROOT # Make sure the xpak module is in PYTHONPATH @@ -43,7 +44,15 @@ if [ -z "$1" ] || [ $1 == "-h" ] || [ $1 == "--help" ] ; then exit 1 fi -source /sbin/functions.sh +source "${PORTAGE_BIN_PATH}/isolated-functions.sh" +case "${NOCOLOR:-false}" in + yes|true) + unset_colors + ;; + no|false) + set_colors + ;; +esac # here we make a package given a little info # $1 = package-name w/version -- cgit v1.2.3-1-g7c22