Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Wed, 03 Jul 2019 21:28:00
Message-Id: 1562189185.f4aa49bc1ba210a1257ae6291a60d0944c32691d.zmedico@gentoo
1 commit: f4aa49bc1ba210a1257ae6291a60d0944c32691d
2 Author: Zac Medico <zachary.medico <AT> sony <DOT> com>
3 AuthorDate: Wed Jul 3 21:20:00 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 3 21:26:25 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f4aa49bc
7
8 ebuild.sh: suppress export error messages for eix-update
9
10 Suppress export error messages like this for eix-update:
11
12 /usr/lib/portage/python3.6/ebuild.sh: line 11: export: ___in_portage_iuse: not a function
13
14 Fixes: 7f1aac111320 ("ebuild.sh: unexport ___in_portage_iuse function (bug 680810)")
15 Bug: https://bugs.gentoo.org/680810
16 Bug: https://bugs.gentoo.org/689128
17 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
18
19 bin/ebuild.sh | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
23 index 50a0330f3..56555a5b7 100755
24 --- a/bin/ebuild.sh
25 +++ b/bin/ebuild.sh
26 @@ -8,7 +8,7 @@ unalias -a
27
28 # Make sure this isn't exported to scripts we execute.
29 unset BASH_COMPAT
30 -export -n -f ___in_portage_iuse
31 +declare -F ___in_portage_iuse >/dev/null && export -n -f ___in_portage_iuse
32
33 source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1