| 1 |
commit: 6983b1a1dd21f931ba751b727bd1a3c460383840 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 30 17:23:01 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 30 17:23:01 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6983b1a1 |
| 7 |
|
| 8 |
phase-functions.sh: chgrp $T/environment |
| 9 |
|
| 10 |
This partially reverts commit 314791e319e3ac7ce75f3a6f9ae9cc5c2b837df6, |
| 11 |
in order to cover possible cases where it may not actually be |
| 12 |
redundant, like if ebuild(1) is used to call pkg_setup as root, and |
| 13 |
then a different user calls src_unpack. We use PORTAGE_GRPNAME if set, |
| 14 |
in order to avoid triggering irrelevant warnings for unprivileged |
| 15 |
prefix users (see chown and chgrp wrappers in commit |
| 16 |
45bedf9cdc10fafd94858f67d62b36d35dd99544). This mirrors the approach |
| 17 |
taken in commit 1c3c3b802014ac6356af09d149aaaffce6c14dc3 of the prefix |
| 18 |
branch. |
| 19 |
|
| 20 |
--- |
| 21 |
bin/phase-functions.sh | 2 ++ |
| 22 |
1 files changed, 2 insertions(+), 0 deletions(-) |
| 23 |
|
| 24 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
| 25 |
index 7a1d6c5..714f7a6 100644 |
| 26 |
--- a/bin/phase-functions.sh |
| 27 |
+++ b/bin/phase-functions.sh |
| 28 |
@@ -971,6 +971,8 @@ __ebuild_main() { |
| 29 |
__save_ebuild_env | __filter_readonly_variables \ |
| 30 |
--filter-features > "$T/environment" |
| 31 |
assert "__save_ebuild_env failed" |
| 32 |
+ chgrp "${PORTAGE_GRPNAME:-portage}" "$T/environment" |
| 33 |
+ chmod g+w "$T/environment" |
| 34 |
fi |
| 35 |
[[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE" |
| 36 |
if [[ -n $PORTAGE_IPC_DAEMON ]] ; then |
Archives