From ec974a0d7637fff2dc2d57917f6dbb5c348c5e7d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 Mar 2012 15:25:23 -0700 Subject: fowners: return success for prefix if EUID != 0 This is based on a patch by Jeremy Olexa from bug #409893. --- bin/ebuild-helpers/fowners | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin/ebuild-helpers') diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners index a5a28f2fb..a213c9eb1 100755 --- a/bin/ebuild-helpers/fowners +++ b/bin/ebuild-helpers/fowners @@ -1,16 +1,22 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh [[ " ${FEATURES} " == *" force-prefix "* ]] || \ - case "$EAPI" in 0|1|2) ED=${D} ;; esac + case "$EAPI" in 0|1|2) EPREFIX= ED=${D} ;; esac # we can't prefix all arguments because # chown takes random options slash="/" chown "${@/#${slash}/${ED}${slash}}" ret=$? + +if [[ ${ret} != 0 && -n ${EPREFIX} && ${EUID} != 0 ]] ; then + ewarn "fowners failure ignored in Prefix with non-privileged user" + exit 0 +fi + [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret -- cgit v1.2.3-1-g7c22