| 1 |
commit: 1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 20:35:17 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 17 06:44:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f8eedc8 |
| 7 |
|
| 8 |
Ban prepallinfo for ebuild scope use |
| 9 |
|
| 10 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 11 |
|
| 12 |
bin/ebuild-helpers/prepall | 4 ++-- |
| 13 |
bin/ebuild-helpers/prepallinfo | 9 ++------- |
| 14 |
2 files changed, 4 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall |
| 17 |
index bc77af4a1..c2d879f37 100755 |
| 18 |
--- a/bin/ebuild-helpers/prepall |
| 19 |
+++ b/bin/ebuild-helpers/prepall |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
#!/bin/bash |
| 22 |
-# Copyright 1999-2012 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
| 27 |
@@ -17,7 +17,7 @@ if has chflags $FEATURES ; then |
| 28 |
fi |
| 29 |
|
| 30 |
prepallman |
| 31 |
-prepallinfo |
| 32 |
+[[ -d ${ED%/}/usr/share/info ]] && prepinfo |
| 33 |
|
| 34 |
___eapi_has_dostrip || prepallstrip |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo |
| 38 |
index 34d6a74b7..e23a6d410 100755 |
| 39 |
--- a/bin/ebuild-helpers/prepallinfo |
| 40 |
+++ b/bin/ebuild-helpers/prepallinfo |
| 41 |
@@ -4,10 +4,5 @@ |
| 42 |
|
| 43 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
| 44 |
|
| 45 |
-if ! ___eapi_has_prefix_variables; then |
| 46 |
- ED=${D} |
| 47 |
-fi |
| 48 |
- |
| 49 |
-[[ -d ${ED%/}/usr/share/info ]] || exit 0 |
| 50 |
- |
| 51 |
-exec prepinfo |
| 52 |
+die "'${0##*/}' is not allowed in ebuild scope" |
| 53 |
+exit 1 |
Archives