diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-11 16:39:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-11 16:39:06 -0700 |
| commit | 22996b1d7c7214da8f0bff76d9f814a00f58fdce (patch) | |
| tree | c15799ca816c6a7f19f44d6eb7e9f7f781ac819c /pym/portage/repository/config.py | |
| parent | 4cdf0ecb9d54300e92912f4e409f9de1fd208e71 (diff) | |
| download | portage-22996b1d7c7214da8f0bff76d9f814a00f58fdce.tar.gz portage-22996b1d7c7214da8f0bff76d9f814a00f58fdce.tar.bz2 portage-22996b1d7c7214da8f0bff76d9f814a00f58fdce.zip | |
Cleanup profile-formats code.v2.2.0_alpha104
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 71aefde1e..872c18944 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -27,6 +27,9 @@ from portage import _unicode_encode from portage import _encodings from portage import manifest +_valid_profile_formats = frozenset( + ['pms', 'portage-1']) + _repo_name_sub_re = re.compile(r'[^\w-]') def _gen_valid_repo(name): @@ -754,7 +757,7 @@ def parse_layout_conf(repo_location, repo_name=None): raw_formats = ('portage-1-compat',) else: raw_formats = set(raw_formats.split()) - unknown = raw_formats.difference(['pms', 'portage-1']) + unknown = raw_formats.difference(_valid_profile_formats) if unknown: repo_name = _get_repo_name(repo_location, cached=repo_name) warnings.warn((_("Repository named '%(repo_name)s' has unsupported " @@ -764,7 +767,7 @@ def parse_layout_conf(repo_location, repo_name=None): layout_filename=layout_filename, unknown_fmts=" ".join(unknown))), DeprecationWarning) - raw_formats = tuple(raw_formats.intersection(['pms', 'portage-1'])) + raw_formats = tuple(raw_formats.intersection(_valid_profile_formats)) data['profile-formats'] = raw_formats return data, layout_errors |