diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-16 13:47:26 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-16 13:47:26 -0700 |
| commit | f39ac7dc706544d1f36392c7def6da0b9b6bebcf (patch) | |
| tree | 84c5d5d91e8566a2fd507521a643a793b447526b /pym/portage/repository/config.py | |
| parent | 304dfb0fb09b799eec526d0703c44fc6a92ef13d (diff) | |
| download | portage-f39ac7dc706544d1f36392c7def6da0b9b6bebcf.tar.gz portage-f39ac7dc706544d1f36392c7def6da0b9b6bebcf.tar.bz2 portage-f39ac7dc706544d1f36392c7def6da0b9b6bebcf.zip | |
RepoConfig: cleanup portage1_profiles codev2.2.0_alpha106
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 872c18944..cb5beca7f 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -30,6 +30,9 @@ from portage import manifest _valid_profile_formats = frozenset( ['pms', 'portage-1']) +_portage1_profiles_allow_directories = frozenset( + ["portage-1-compat", "portage-1"]) + _repo_name_sub_re = re.compile(r'[^\w-]') def _gen_valid_repo(name): @@ -160,7 +163,7 @@ class RepoConfig(object): 'sign-commit', 'sign-manifest', 'thin-manifest', 'update-changelog'): setattr(self, value.lower().replace("-", "_"), layout_data[value]) - self.portage1_profiles = any(x.startswith("portage-1") \ + self.portage1_profiles = any(x in _portage1_profiles_allow_directories for x in layout_data['profile-formats']) self.portage1_profiles_compat = layout_data['profile-formats'] == ('portage-1-compat',) |