Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: Re: [gentoo-portage-dev] [PATCH v2] Move INSTALL_MASK handling into merging
Date: Sun, 12 Jun 2016 20:29:13
Message-Id: 575DC610.4020200@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH v2] Move INSTALL_MASK handling into merging by "Michał Górny"
1 On 05/22/2016 01:21 AM, Michał Górny wrote:
2 > diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
3 > index fcc7ce5..9d13703 100644
4 > --- a/pym/portage/package/ebuild/config.py
5 > +++ b/pym/portage/package/ebuild/config.py
6 > @@ -1774,14 +1774,14 @@ class config(object):
7 > _eapi_cache.clear()
8 >
9 > # Prepare the final value of INSTALL_MASK
10 > - install_mask = self["INSTALL_MASK"].split()
11 > + install_mask = self.get("INSTALL_MASK", "").split()
12 > if 'nodoc' in self.features:
13 > install_mask.append("/usr/share/doc")
14 > if 'noinfo' in self.features:
15 > install_mask.append("/usr/share/info")
16 > if 'noman' in self.features:
17 > install_mask.append("/usr/share/man")
18 > - self["INSTALL_MASK"] = ' '.join(install_mask)
19 > + self.install_mask = install_mask
20 >
21 > def _grab_pkg_env(self, penv, container, protected_keys=None):
22 > if protected_keys is None:
23 >
24
25 The config.reset method should reset self.install_mask to match the
26 global INSTALL_MASK setting.
27 --
28 Thanks,
29 Zac

Replies