Gentoo Archives: gentoo-commits

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/files/
Date: Wed, 30 May 2018 12:43:33
Message-Id: 1527684136.fe071cb671b6135d742c39ba09f40fd8812d41a8.haubi@gentoo
1 commit: fe071cb671b6135d742c39ba09f40fd8812d41a8
2 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 30 12:42:16 2018 +0000
4 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5 CommitDate: Wed May 30 12:42:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fe071cb6
7
8 sys-apps/portage (ebuildshell): preserve HOME across env -i
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-apps/portage/files/portage-2.3.40-ebuildshell.patch | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
16 index 167ed3824e..0c1e48a82d 100644
17 --- a/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
18 +++ b/sys-apps/portage/files/portage-2.3.40-ebuildshell.patch
19 @@ -1,4 +1,4 @@
20 -From 9075d30d24af87f69d23ae129dc75e1305cd3aa8 Mon Sep 17 00:00:00 2001
21 +From 8c6b115fa0325b5bed2e1a9c4c8e8af45cdecc2e Mon Sep 17 00:00:00 2001
22 From: Michael Haubenwallner <michael.haubenwallner@×××××××.at>
23 Date: Wed, 6 Nov 2013 12:40:05 +0100
24 Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
25 @@ -13,7 +13,7 @@ Subject: [PATCH 1/2] Add ebuildshell feature, bug#155161.
26 6 files changed, 194 insertions(+), 17 deletions(-)
27
28 diff --git a/bin/ebuild.sh b/bin/ebuild.sh
29 -index f76a48d8e..51ba95cb1 100755
30 +index f76a48d8e..683a4e9c1 100755
31 --- a/bin/ebuild.sh
32 +++ b/bin/ebuild.sh
33 @@ -121,7 +121,7 @@ __qa_source() {
34 @@ -148,7 +148,7 @@ index f76a48d8e..51ba95cb1 100755
35 + echo '"$@"' >> ~/.bash_history
36 + chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} ~/.bash_history &>/dev/null
37 +
38 -+ env -i ${BASH} --rcfile "${__ebuildshell_tmpf}.ebuild-env" -i
39 ++ env -i HOME=~ ${BASH} --rcfile "${__ebuildshell_tmpf}.ebuild-env" -i
40 +
41 + # The environment- and exit-status handling after leaving the ebuildshell
42 + # prompt is expected to be identical as without the ebuildshell prompt.