diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-03-22 21:35:17 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-09-17 08:44:55 +0200 |
| commit | 1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3 (patch) | |
| tree | b22114e7e8f7e9de867c2751210d309d445a829c | |
| parent | install-qa-checks.d: Add a check for Gentoo path policies (FHS-y) (diff) | |
| download | portage-1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3.tar.gz portage-1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3.tar.bz2 portage-1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3.zip | |
Ban prepallinfo for ebuild scope use
Reviewed-by: Zac Medico <zmedico@gentoo.org>
| -rwxr-xr-x | bin/ebuild-helpers/prepall | 4 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/prepallinfo | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall index bc77af4a1..c2d879f37 100755 --- a/bin/ebuild-helpers/prepall +++ b/bin/ebuild-helpers/prepall @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 @@ -17,7 +17,7 @@ if has chflags $FEATURES ; then fi prepallman -prepallinfo +[[ -d ${ED%/}/usr/share/info ]] && prepinfo ___eapi_has_dostrip || prepallstrip diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo index 34d6a74b7..e23a6d410 100755 --- a/bin/ebuild-helpers/prepallinfo +++ b/bin/ebuild-helpers/prepallinfo @@ -4,10 +4,5 @@ source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 -if ! ___eapi_has_prefix_variables; then - ED=${D} -fi - -[[ -d ${ED%/}/usr/share/info ]] || exit 0 - -exec prepinfo +die "'${0##*/}' is not allowed in ebuild scope" +exit 1 |