diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-11 23:46:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-11 23:46:09 +0000 |
| commit | 64cfd37f4196621a89e8f9619f77746ba1b0b480 (patch) | |
| tree | 1563d05c84c200e666148140adafb260dae5d585 | |
| parent | Rename dohtml to dohtml.py. Next commit will add a shell script wrapper for (diff) | |
| download | portage-multirepo-64cfd37f4196621a89e8f9619f77746ba1b0b480.tar.gz portage-multirepo-64cfd37f4196621a89e8f9619f77746ba1b0b480.tar.bz2 portage-multirepo-64cfd37f4196621a89e8f9619f77746ba1b0b480.zip | |
Use a shell script for dohtml instead of a function, for xargs compatibility.
(trunk r14582)
svn path=/main/branches/2.1.7/; revision=14584
| -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 00000000..95626eb6 --- /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 d026fddf..0c755393 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 |