diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-02-17 15:56:56 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-17 16:00:32 -0800 |
| commit | ce20cdf1e868e8628b541abec9b99f3527ca22a1 (patch) | |
| tree | b952a908cf22fa18fa86e5b3ef1480afd06805cc /pym/portage/repository/config.py | |
| parent | ea3c8864c19a5ef0d337f8a1314128faad4977aa (diff) | |
| download | portage-ce20cdf1e868e8628b541abec9b99f3527ca22a1.tar.gz portage-ce20cdf1e868e8628b541abec9b99f3527ca22a1.tar.bz2 portage-ce20cdf1e868e8628b541abec9b99f3527ca22a1.zip | |
repoman: make virtual.oldstyle an error
Also, add "allow-provide-virtuals = true" setting for
metadata/layout.conf which reduces it to a warning.
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 84d97411e..defdb47c8 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -45,7 +45,7 @@ def _gen_valid_repo(name): class RepoConfig(object): """Stores config of one repository""" - __slots__ = ('aliases', 'allow_missing_manifest', + __slots__ = ('aliases', 'allow_missing_manifest', 'allow_provide_virtual', 'cache_formats', 'create_manifest', 'disable_manifest', 'eapi', 'eclass_db', 'eclass_locations', 'eclass_overrides', 'format', 'location', 'main_repo', 'manifest_hashes', 'masters', 'missing_repo_name', @@ -123,6 +123,7 @@ class RepoConfig(object): self.sign_manifest = True self.thin_manifest = False self.allow_missing_manifest = False + self.allow_provide_virtual = False self.create_manifest = True self.disable_manifest = False self.manifest_hashes = None @@ -149,7 +150,8 @@ class RepoConfig(object): # them the ability to do incremental overrides self.aliases = layout_data['aliases'] + tuple(aliases) - for value in ('allow-missing-manifest', 'cache-formats', + for value in ('allow-missing-manifest', + 'allow-provide-virtual', 'cache-formats', 'create-manifest', 'disable-manifest', 'manifest-hashes', 'sign-commit', 'sign-manifest', 'thin-manifest', 'update-changelog'): setattr(self, value.lower().replace("-", "_"), layout_data[value]) @@ -691,6 +693,9 @@ def parse_layout_conf(repo_location, repo_name=None): data['masters'] = masters data['aliases'] = tuple(layout_data.get('aliases', '').split()) + data['allow-provide-virtual'] = \ + layout_data.get('allow-provide-virtuals', 'false').lower() == 'true' + data['sign-commit'] = layout_data.get('sign-commits', 'false').lower() \ == 'true' |