1 |
commit: 09caf4abe3e58ea120f5db4bc06e04dde971734c |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 01:11:30 2021 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 01:12:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09caf4ab |
7 |
|
8 |
sys-apps/portage: env -u PORTAGE_REPOSITORIES (bug 749333) |
9 |
|
10 |
Bug: https://bugs.gentoo.org/749333 |
11 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
13 |
|
14 |
sys-apps/portage/portage-3.0.12.ebuild | 2 +- |
15 |
sys-apps/portage/portage-3.0.13.ebuild | 2 +- |
16 |
sys-apps/portage/portage-3.0.14.ebuild | 2 +- |
17 |
sys-apps/portage/portage-3.0.15-r2.ebuild | 2 +- |
18 |
sys-apps/portage/portage-9999.ebuild | 4 ++-- |
19 |
5 files changed, 6 insertions(+), 6 deletions(-) |
20 |
|
21 |
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild |
22 |
index 7980c3ee293..0c67947746e 100644 |
23 |
--- a/sys-apps/portage/portage-3.0.12.ebuild |
24 |
+++ b/sys-apps/portage/portage-3.0.12.ebuild |
25 |
@@ -243,7 +243,7 @@ pkg_preinst() { |
26 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
27 |
"${PYTHON}" -m portage._compat_upgrade.default_locations || die |
28 |
|
29 |
- env -u BINPKG_COMPRESS \ |
30 |
+ env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ |
31 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
32 |
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |
33 |
|
34 |
|
35 |
diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild |
36 |
index 7980c3ee293..0c67947746e 100644 |
37 |
--- a/sys-apps/portage/portage-3.0.13.ebuild |
38 |
+++ b/sys-apps/portage/portage-3.0.13.ebuild |
39 |
@@ -243,7 +243,7 @@ pkg_preinst() { |
40 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
41 |
"${PYTHON}" -m portage._compat_upgrade.default_locations || die |
42 |
|
43 |
- env -u BINPKG_COMPRESS \ |
44 |
+ env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ |
45 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
46 |
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |
47 |
|
48 |
|
49 |
diff --git a/sys-apps/portage/portage-3.0.14.ebuild b/sys-apps/portage/portage-3.0.14.ebuild |
50 |
index 57a36478cce..26f0e3f8e28 100644 |
51 |
--- a/sys-apps/portage/portage-3.0.14.ebuild |
52 |
+++ b/sys-apps/portage/portage-3.0.14.ebuild |
53 |
@@ -243,7 +243,7 @@ pkg_preinst() { |
54 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
55 |
"${PYTHON}" -m portage._compat_upgrade.default_locations || die |
56 |
|
57 |
- env -u BINPKG_COMPRESS \ |
58 |
+ env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ |
59 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
60 |
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |
61 |
|
62 |
|
63 |
diff --git a/sys-apps/portage/portage-3.0.15-r2.ebuild b/sys-apps/portage/portage-3.0.15-r2.ebuild |
64 |
index 08381b58595..eb9abac2065 100644 |
65 |
--- a/sys-apps/portage/portage-3.0.15-r2.ebuild |
66 |
+++ b/sys-apps/portage/portage-3.0.15-r2.ebuild |
67 |
@@ -250,7 +250,7 @@ pkg_preinst() { |
68 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
69 |
"${PYTHON}" -m portage._compat_upgrade.default_locations || die |
70 |
|
71 |
- env -u BINPKG_COMPRESS \ |
72 |
+ env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ |
73 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
74 |
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |
75 |
|
76 |
|
77 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
78 |
index 76d98e48e66..cbe56d13e92 100644 |
79 |
--- a/sys-apps/portage/portage-9999.ebuild |
80 |
+++ b/sys-apps/portage/portage-9999.ebuild |
81 |
@@ -1,4 +1,4 @@ |
82 |
-# Copyright 1999-2020 Gentoo Authors |
83 |
+# Copyright 1999-2021 Gentoo Authors |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
|
86 |
EAPI=7 |
87 |
@@ -234,7 +234,7 @@ pkg_preinst() { |
88 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
89 |
"${PYTHON}" -m portage._compat_upgrade.default_locations || die |
90 |
|
91 |
- env -u BINPKG_COMPRESS \ |
92 |
+ env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ |
93 |
PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
94 |
"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |