aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-03-29 14:51:13 -0700
committerZac Medico <zmedico@gentoo.org>2018-03-29 15:33:42 -0700
commitcc0349c549b3024615fb8fb5c72c78b9509ee5bb (patch)
tree065157712253af8e5670b40b5de706badf7135bf /pym/portage/dbapi/vartree.py
parentUpdates for portage-2.3.26 release (diff)
downloadportage-cc0349c549b3024615fb8fb5c72c78b9509ee5bb.tar.gz
portage-cc0349c549b3024615fb8fb5c72c78b9509ee5bb.tar.bz2
portage-cc0349c549b3024615fb8fb5c72c78b9509ee5bb.zip
INSTALL_MASK: honor install time config for binary packages (bug 651952)
For binary packages, honor the INSTALL_MASK configuration that exists at install time, since it might differ from the build time setting. Fixes: 3416876c0ee7 ("{,PKG_}INSTALL_MASK: python implementation") Bug: https://bugs.gentoo.org/651952
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 378d42dc0..a136c38f1 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3846,6 +3846,11 @@ class dblink(object):
# be useful to avoid collisions in some scenarios.
# We cannot detect if this is needed or not here as INSTALL_MASK can be
# modified by bashrc files.
+ phase = MiscFunctionsProcess(background=False,
+ commands=["preinst_mask"], phase="preinst",
+ scheduler=self._scheduler, settings=self.settings)
+ phase.start()
+ phase.wait()
try:
with io.open(_unicode_encode(os.path.join(inforoot, "INSTALL_MASK"),
encoding=_encodings['fs'], errors='strict'),