diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-11 23:45:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-11 23:45:11 +0000 |
| commit | 14453c3c9ba6032874ea4d1621187053ffc7d266 (patch) | |
| tree | 29c139df51d73b4c8a74369d8c0acc0471588e5f /bin | |
| parent | f9cc4d7f34b9186fb96635ee937477a46623f6c1 (diff) | |
| download | portage-14453c3c9ba6032874ea4d1621187053ffc7d266.tar.gz portage-14453c3c9ba6032874ea4d1621187053ffc7d266.tar.bz2 portage-14453c3c9ba6032874ea4d1621187053ffc7d266.zip | |
Use a shell script for dohtml instead of a function, for xargs compatibility.
svn path=/main/trunk/; revision=14582
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild-helpers/dohtml | 11 | ||||
| -rwxr-xr-x | bin/ebuild.sh | 7 |
2 files changed, 11 insertions, 7 deletions
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 |