From 08a713eecdedbd3ed8cc57e24715d22520bc02b0 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 13 Dec 2010 22:53:30 +0100 Subject: [PATCH] properly rename old PORTAGE_PYTHON to PREFIX_PORTAGE_PYTHON --- acinclude.m4 | 12 +++++------- bin/archive-conf | 2 +- bin/binhost-snapshot | 2 +- bin/check-implicit-pointer-usage.py | 2 +- bin/clean_locks | 2 +- bin/dispatch-conf | 2 +- bin/dohtml.py | 2 +- bin/ebuild | 2 +- bin/ebuild-helpers/dohtml | 2 +- bin/ebuild-helpers/portageq | 2 +- bin/ebuild-ipc | 2 +- bin/ebuild-ipc.py | 2 +- bin/ebuild.sh | 4 ++-- bin/egencache | 2 +- bin/emaint | 2 +- bin/emerge | 2 +- bin/env-update | 2 +- bin/filter-bash-environment.py | 2 +- bin/fixpackages | 2 +- bin/glsa-check | 2 +- bin/misc-functions.sh | 4 ++-- bin/portageq | 2 +- bin/quickpkg | 2 +- bin/regenworld | 2 +- bin/repoman | 2 +- bin/xpak-helper.py | 2 +- pym/Makefile.in | 2 +- runtests.sh | 4 ++-- subst-install.in | 2 +- tarball.sh | 2 +- 30 files changed, 37 insertions(+), 39 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 47c537fc9..5bf24daeb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -16,19 +16,17 @@ dnl GENTOO_PATH_PYTHON([minimum-version], [path]) dnl author: Fabian Groffen AC_DEFUN([GENTOO_PATH_PYTHON], [ - AC_PATH_PROG([HERE_PORTAGE_PYTHON], [python], no, $2) - dnl Portage's ebuild.sh defines PORTAGE_PYTHON itself now :( - PORTAGE_PYTHON="$HERE_PORTAGE_PYTHON" + AC_PATH_PROG([PREFIX_PORTAGE_PYTHON], [python], no, $2) dnl is is there at all? - if test "$PORTAGE_PYTHON" = "no" ; then + if test "$PREFIX_PORTAGE_PYTHON" = "no" ; then AC_MSG_ERROR([no python found in your path]) fi dnl is it the version we want? - ver=`$PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]]'` - AC_MSG_CHECKING([whether $PORTAGE_PYTHON $ver >= $1]) - cmp=`$PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]] >= "$1"'` + ver=`$PREFIX_PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]]'` + AC_MSG_CHECKING([whether $PREFIX_PORTAGE_PYTHON $ver >= $1]) + cmp=`$PREFIX_PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]] >= "$1"'` if test "$cmp" = "True" ; then AC_MSG_RESULT([yes]) else diff --git a/bin/archive-conf b/bin/archive-conf index aca1ac37a..ff4644488 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot index 64e33a14e..662b027e2 100755 --- a/bin/binhost-snapshot +++ b/bin/binhost-snapshot @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py index f261e2ef5..710a0b8df 100755 --- a/bin/check-implicit-pointer-usage.py +++ b/bin/check-implicit-pointer-usage.py @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Ripped from HP and updated from Debian # Update by Gentoo to support unicode output diff --git a/bin/clean_locks b/bin/clean_locks index 23a548598..c97794fac 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 0cd4b0e03..6ce255ed5 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/dohtml.py b/bin/dohtml.py index b93cf84c8..bf9bcc836 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/ebuild b/bin/ebuild index 7745f4f5d..e4da02c40 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index b5c73e30a..b3a3c7a1e 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -7,7 +7,7 @@ source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym} PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/dohtml.py" "$@" + "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_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 39ccb09dd..1afd79ae4 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -5,4 +5,4 @@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym} PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - exec "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/portageq" "$@" + exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/portageq" "$@" diff --git a/bin/ebuild-ipc b/bin/ebuild-ipc index 5bd7da1e2..5b9ad53b3 100755 --- a/bin/ebuild-ipc +++ b/bin/ebuild-ipc @@ -5,4 +5,4 @@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - exec "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@" + exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@" diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index 54261398e..786f4a766 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # diff --git a/bin/ebuild.sh b/bin/ebuild.sh index af0f0eefb..693ae9485 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -209,7 +209,7 @@ portageq() { fi PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" "$@" + "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}/portageq" "$@" } @@ -1813,7 +1813,7 @@ filter_readonly_variables() { " fi - "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" + "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" } # @FUNCTION: preprocess_ebuild_env diff --git a/bin/egencache b/bin/egencache index a78ff97a0..0e763279c 100755 --- a/bin/egencache +++ b/bin/egencache @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2009-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/emaint b/bin/emaint index a71b56b86..6d68cb0b2 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # vim: noet : from __future__ import print_function diff --git a/bin/emerge b/bin/emerge index eaf6fc6af..8d56c0929 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2006-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/env-update b/bin/env-update index 7455c5107..32c251e02 100755 --- a/bin/env-update +++ b/bin/env-update @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py index 9a2d845e9..126e4801a 100755 --- a/bin/filter-bash-environment.py +++ b/bin/filter-bash-environment.py @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/fixpackages b/bin/fixpackages index 396f3aa97..a60852a02 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/glsa-check b/bin/glsa-check index 8892a852d..64209ab82 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2008-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 6dbc2f423..dc54f811f 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -667,7 +667,7 @@ install_qa_check_misc() { [[ $PORTAGE_LOG_FILE = *.gz ]] && cat_cmd=zcat [[ $reset_debug = 1 ]] && set -x f=$($cat_cmd "${PORTAGE_LOG_FILE}" | \ - "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed") + "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed") if [[ -n ${f} ]] ; then # In the future this will be a forced "die". In preparation, @@ -1604,7 +1604,7 @@ dyn_package() { $PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE" assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'" PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "${PORTAGE_PYTHON:-@PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ + "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ "$PORTAGE_BINPKG_TMPFILE" "$PORTAGE_BUILDDIR/build-info" if [ $? -ne 0 ]; then rm -f "${PORTAGE_BINPKG_TMPFILE}" diff --git a/bin/portageq b/bin/portageq index e7153f4ad..1fa290d74 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/quickpkg b/bin/quickpkg index f9086c77e..258589e39 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/regenworld b/bin/regenworld index cb9b551f3..e0e9774c4 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/repoman b/bin/repoman index beca5e06d..ac4d428ba 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ -O +#!@PREFIX_PORTAGE_PYTHON@ -O # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py index 43ed18b01..4d096cc6b 100755 --- a/bin/xpak-helper.py +++ b/bin/xpak-helper.py @@ -1,4 +1,4 @@ -#!@PORTAGE_PYTHON@ +#!@PREFIX_PORTAGE_PYTHON@ # Copyright 2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 diff --git a/pym/Makefile.in b/pym/Makefile.in index 7e79b67fe..aa903bb42 100644 --- a/pym/Makefile.in +++ b/pym/Makefile.in @@ -4,7 +4,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ sysconfdir = @sysconfdir@ libdir = @libdir@ -PYTHON = @PORTAGE_PYTHON@ +PYTHON = @PREFIX_PORTAGE_PYTHON@ srcdir=@srcdir@ top_builddir=@top_builddir@ diff --git a/runtests.sh b/runtests.sh index 31910d65d..f3d91a926 100755 --- a/runtests.sh +++ b/runtests.sh @@ -24,9 +24,9 @@ trap interrupted SIGINT exit_status="0" for version in ${PYTHON_VERSIONS}; do - if [[ -x @PORTAGE_PYTHON@${version} ]]; then + if [[ -x @PREFIX_PORTAGE_PYTHON@${version} ]]; then echo -e "${GOOD}Testing with Python ${version}...${NORMAL}" - if ! @PORTAGE_PYTHON@${version} pym/portage/tests/runTests; then + if ! @PREFIX_PORTAGE_PYTHON@${version} pym/portage/tests/runTests; then echo -e "${BAD}Testing with Python ${version} failed${NORMAL}" exit_status="1" fi diff --git a/subst-install.in b/subst-install.in index 24dc4fa7b..3ae07c1f5 100644 --- a/subst-install.in +++ b/subst-install.in @@ -31,7 +31,7 @@ sedexp=( -e "s,${at}PORTAGE_FIND${at},@PORTAGE_FIND@,g" -e "s,${at}PORTAGE_GREP${at},@PORTAGE_GREP@,g" -e "s,${at}PORTAGE_MV${at},@PORTAGE_MV@,g" - -e "s,${at}PORTAGE_PYTHON${at},@PORTAGE_PYTHON@,g" + -e "s,${at}PORTAGE_PYTHON${at},@PREFIX_PORTAGE_PYTHON@,g" -e "s,${at}PORTAGE_RM${at},@PORTAGE_RM@,g" -e "s,${at}PORTAGE_SED${at},@PORTAGE_SED@,g" -e "s,${at}PORTAGE_WGET${at},@PORTAGE_WGET@,g" diff --git a/tarball.sh b/tarball.sh index 972374827..fd58e3ba8 100755 --- a/tarball.sh +++ b/tarball.sh @@ -15,7 +15,7 @@ export DEST="${TMP}/${PKG}-${V}" ./tabcheck.py $( find ./ -name .git -o -name .hg -prune -o -type f ! -name '*.py' -print \ - | xargs grep -l "#\!@PORTAGE_PYTHON@" + | xargs grep -l "#\!@PREFIX_PORTAGE_PYTHON@" find ./ -name .git -o -name .hg -prune -o -type f -name '*.py' -print ) -- 2.26.2