commit:     09caf4abe3e58ea120f5db4bc06e04dde971734c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 01:11:30 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 01:12:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09caf4ab

sys-apps/portage: env -u PORTAGE_REPOSITORIES (bug 749333)

Bug: https://bugs.gentoo.org/749333
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/portage-3.0.12.ebuild    | 2 +-
 sys-apps/portage/portage-3.0.13.ebuild    | 2 +-
 sys-apps/portage/portage-3.0.14.ebuild    | 2 +-
 sys-apps/portage/portage-3.0.15-r2.ebuild | 2 +-
 sys-apps/portage/portage-9999.ebuild      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.12.ebuild 
b/sys-apps/portage/portage-3.0.12.ebuild
index 7980c3ee293..0c67947746e 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -243,7 +243,7 @@ pkg_preinst() {
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
-       env -u BINPKG_COMPRESS \
+       env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 

diff --git a/sys-apps/portage/portage-3.0.13.ebuild 
b/sys-apps/portage/portage-3.0.13.ebuild
index 7980c3ee293..0c67947746e 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -243,7 +243,7 @@ pkg_preinst() {
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
-       env -u BINPKG_COMPRESS \
+       env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 

diff --git a/sys-apps/portage/portage-3.0.14.ebuild 
b/sys-apps/portage/portage-3.0.14.ebuild
index 57a36478cce..26f0e3f8e28 100644
--- a/sys-apps/portage/portage-3.0.14.ebuild
+++ b/sys-apps/portage/portage-3.0.14.ebuild
@@ -243,7 +243,7 @@ pkg_preinst() {
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
-       env -u BINPKG_COMPRESS \
+       env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 

diff --git a/sys-apps/portage/portage-3.0.15-r2.ebuild 
b/sys-apps/portage/portage-3.0.15-r2.ebuild
index 08381b58595..eb9abac2065 100644
--- a/sys-apps/portage/portage-3.0.15-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.15-r2.ebuild
@@ -250,7 +250,7 @@ pkg_preinst() {
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
-       env -u BINPKG_COMPRESS \
+       env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-9999.ebuild
index 76d98e48e66..cbe56d13e92 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -234,7 +234,7 @@ pkg_preinst() {
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
-       env -u BINPKG_COMPRESS \
+       env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
                PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
                "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 

Reply via email to