diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-13 19:01:14 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-13 19:01:14 -0700 |
commit | 5546223c61ff1723f047143502a2cae332622e2e (patch) | |
tree | 0c32e1710291368ffdc5c8ee19855d4466db16c8 /bin/ebuild-helpers | |
parent | 3146e53630438473ad241939a5dfa2b71e9cf559 (diff) | |
parent | 2d8eaedb61bdbe4a47d6b27c8a3e67754078773d (diff) | |
download | portage-5546223c61ff1723f047143502a2cae332622e2e.tar.gz portage-5546223c61ff1723f047143502a2cae332622e2e.tar.bz2 portage-5546223c61ff1723f047143502a2cae332622e2e.zip |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
Diffstat (limited to 'bin/ebuild-helpers')
-rwxr-xr-x | bin/ebuild-helpers/dohtml | 8 | ||||
-rwxr-xr-x | bin/ebuild-helpers/portageq | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index e1ab7d970..cb29dc3f3 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -1,15 +1,13 @@ #!/bin/bash -# Copyright 2009 Gentoo Foundation +# Copyright 2009-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh 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.py doesn't try -# to use potentially unsupported version of Python. -EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - "$PORTAGE_BIN_PATH/dohtml.py" "$@" +PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ + "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@" ret=$? [[ $ret -ne 0 ]] && helpers_die "$0 failed" diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq index 3a06fdd68..ec30b66cb 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -1,10 +1,8 @@ #!/bin/bash -# Copyright 2009 Gentoo Foundation +# Copyright 2009-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 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 portageq doesn't try -# to use potentially unsupported version of Python. -EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - exec "$PORTAGE_BIN_PATH/portageq" "$@" +PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ + exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@" |