From: Zac Medico Date: Fri, 2 Aug 2013 17:41:45 +0000 (-0700) Subject: prepstrip: PORTAGE_PYTHONPATH for xattr-helper.py X-Git-Tag: v2.2.0_alpha192~21 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f682400890735071f58bb834d1c95372578a18f;p=portage.git prepstrip: PORTAGE_PYTHONPATH for xattr-helper.py --- diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 66aa73417..9b2d47cbd 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -1,7 +1,8 @@ #!/bin/bash -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/helper-functions.sh # avoid multiple calls to `has`. this creates things like: @@ -42,10 +43,12 @@ if [[ ${KERNEL} == linux ]] && ${FEATURES_xattr} ; then } else dump_xattrs() { + PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ "${PORTAGE_PYTHON:-/usr/bin/python}" \ "${PORTAGE_BIN_PATH}/xattr-helper.py" --dump < <(echo -n "$1") } restore_xattrs() { + PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ "${PORTAGE_PYTHON:-/usr/bin/python}" \ "${PORTAGE_BIN_PATH}/xattr-helper.py" --restore }