commit:     453c02fa66c76e776d789cb2edc1768396eb0c6d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 01:57:02 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 02:10:47 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=453c02fa

RepoConfig: add properties-allowed attribute

Bug: https://bugs.gentoo.org/690786
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/repository/config.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
index 46bb6b65a..50ab18026 100644
--- a/lib/portage/repository/config.py
+++ b/lib/portage/repository/config.py
@@ -103,6 +103,7 @@ class RepoConfig(object):
                'portage1_profiles_compat',
                'priority',
                'profile_formats',
+               'properties_allowed',
                'restrict_allowed',
                'sign_commit',
                'sign_manifest',
@@ -340,7 +341,7 @@ class RepoConfig(object):
                        for value in ('allow-missing-manifest',
                                'cache-formats',
                                'create-manifest', 'disable-manifest', 
'manifest-hashes',
-                               'manifest-required-hashes', 'profile-formats', 
'restrict-allowed',
+                               'manifest-required-hashes', 'profile-formats', 
'properties-allowed', 'restrict-allowed',
                                'sign-commit', 'sign-manifest', 
'thin-manifest', 'update-changelog'):
                                setattr(self, value.lower().replace("-", "_"), 
layout_data[value])
 
@@ -1143,6 +1144,11 @@ def parse_layout_conf(repo_location, repo_name=None):
        data['eapis-banned'] = tuple(layout_data.get('eapis-banned', 
'').split())
        data['eapis-deprecated'] = tuple(layout_data.get('eapis-deprecated', 
'').split())
 
+       properties_allowed = layout_data.get('properties-allowed')
+       if properties_allowed is not None:
+               properties_allowed = tuple(properties_allowed.split())
+       data['properties-allowed'] = properties_allowed
+
        restrict_allowed = layout_data.get('restrict-allowed')
        if restrict_allowed is not None:
                restrict_allowed = tuple(restrict_allowed.split())

Reply via email to