Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/
Date: Tue, 06 Jul 2021 07:10:19
Message-Id: 1625555085.2c3c1bfb3d2f45d67ec250a7d9514952f2685bb0.grobian@gentoo
1 commit: 2c3c1bfb3d2f45d67ec250a7d9514952f2685bb0
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 6 07:04:45 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 6 07:04:45 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c3c1bfb
7
8 ebuild-pyhelper: fix path to python executable
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 bin/ebuild-pyhelper | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/bin/ebuild-pyhelper b/bin/ebuild-pyhelper
16 index d32bc6f6f..dbddd6e2a 100755
17 --- a/bin/ebuild-pyhelper
18 +++ b/bin/ebuild-pyhelper
19 @@ -1,4 +1,4 @@
20 -#!/bin/bash
21 +#!@PORTAGE_BASH@
22 # Copyright 2010-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 @@ -14,7 +14,7 @@ cd "${PORTAGE_PYM_PATH}" || exit 1
26 for path in "${PORTAGE_BIN_PATH}/${0##*/}"{.py,}; do
27 if [[ -x "${path}" ]]; then
28 PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
29 - exec "${PORTAGE_PYTHON:-/usr/bin/python}" "${path}" "$@"
30 + exec "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@/usr/bin/python}" "${path}" "$@"
31 fi
32 done
33 echo "File not found: ${path}" >&2