From 14453c3c9ba6032874ea4d1621187053ffc7d266 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 11 Oct 2009 23:45:11 +0000 Subject: Use a shell script for dohtml instead of a function, for xargs compatibility. svn path=/main/trunk/; revision=14582 --- bin/ebuild-helpers/dohtml | 11 +++++++++++ bin/ebuild.sh | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100755 bin/ebuild-helpers/dohtml (limited to 'bin') diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml new file mode 100755 index 000000000..95626eb69 --- /dev/null +++ b/bin/ebuild-helpers/dohtml @@ -0,0 +1,11 @@ +#!/bin/bash +# Copyright 2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} +PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} +# Set EPYTHON variable as empty so that dohtml doesn't try +# to use potentially unsupported version of Python. +EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ + exec "$PORTAGE_BIN_PATH/dohtml.py" "$@" diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a9e09b202..dd87714ca 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -227,13 +227,6 @@ best_version() { esac } -dohtml() { - # Set EPYTHON variable as empty so that dohtml doesn't try - # to use potentially unsupported version of Python. - EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "${PORTAGE_BIN_PATH}/ebuild-helpers/dohtml" "$@" -} - use_with() { if [ -z "$1" ]; then echo "!!! use_with() called without a parameter." >&2 -- cgit v1.2.3-1-g7c22