diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-27 10:10:53 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-27 10:10:53 -0700 |
| commit | 03c4ecb1f49415b886d52bcaad773c9853343b55 (patch) | |
| tree | 2b75187bfef43aa8ec422a55a49564023132916c /pym/portage/repository/config.py | |
| parent | 34acc9e79a941cac9591c6ae723e73054141e2e7 (diff) | |
| download | portage-03c4ecb1f49415b886d52bcaad773c9853343b55.tar.gz portage-03c4ecb1f49415b886d52bcaad773c9853343b55.tar.bz2 portage-03c4ecb1f49415b886d52bcaad773c9853343b55.zip | |
parse_layout_conf: fix profile-formats warning
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 07969ccb4..9bffd7097 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -676,11 +676,13 @@ def parse_layout_conf(repo_location, repo_name=None): else: raw_formats = set(raw_formats.split()) unknown = raw_formats.difference(['pms', 'portage-1']) - warnings.warn((_("Repository named '%(repo_name)s' has unsupported " - "profiles in use ('profile-format' setting in '%(layout_filename)s;" - " please upgrade portage.") % - dict(repo_name=repo_name, layout_filename=layout_filename)), - DeprecationWarning) + if unknown: + warnings.warn((_("Repository named '%(repo_name)s' has unsupported " + "profiles in use ('profile-format = %(unknown_fmts)s' setting in " + "'%(layout_filename)s; please upgrade portage.") % + dict(repo_name=repo_name, layout_filename=layout_filename, + unknown_fmts=" ".join(unknown))), + DeprecationWarning) raw_formats = tuple(raw_formats.intersection(['pms', 'portage-1'])) data['profile-formats'] = raw_formats |