diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-27 19:48:16 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-27 19:48:16 -0700 |
| commit | d3acfaa3e8a61ab86edfe04e9a37c77737d9998b (patch) | |
| tree | 6884bc54c6a5710227a3ed94800472831984dc88 /pym | |
| parent | df6078a76dc549b83de5a056a6a1dc52bdd69107 (diff) | |
| download | portage-d3acfaa3e8a61ab86edfe04e9a37c77737d9998b.tar.gz portage-d3acfaa3e8a61ab86edfe04e9a37c77737d9998b.tar.bz2 portage-d3acfaa3e8a61ab86edfe04e9a37c77737d9998b.zip | |
MaskManager: portage-1-compat warnings.warn
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/package/ebuild/_config/LocationsManager.py | 5 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/MaskManager.py | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index ec3f0035f..244b7e053 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -136,15 +136,14 @@ class LocationsManager(object): offenders = sorted(x for x in offenders if os.path.isdir(os.path.join(currentPath, x))) if offenders: - warnings.warn((_("Profile '%(profile_path)s' in repository " + warnings.warn(_("Profile '%(profile_path)s' in repository " "'%(repo_name)s' is implicitly using 'portage-1' profile format, but " "the repository profiles are not marked as that format. This will break " "in the future. Please either convert the following paths " "to files, or add\nprofile-formats = portage-1\nto the " "repositories layout.conf. Files: '%(files)s'\n") % dict(profile_path=currentPath, repo_name=repo_loc, - files=', '.join(offenders))), - ) + files=', '.join(offenders))) parentsFile = os.path.join(currentPath, "parent") eapi_file = os.path.join(currentPath, "eapi") diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py index affa5af31..64a1c5e15 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -5,6 +5,8 @@ __all__ = ( 'MaskManager', ) +import warnings + from portage import os from portage.dep import ExtendedAtomDict, match_from_list, _repo_separator, _slot_separator from portage.localization import _ @@ -40,14 +42,13 @@ class MaskManager(object): recursive=repo_config.portage1_profiles, remember_source_file=True, verify_eapi=True) if repo_config.portage1_profiles_compat and os.path.isdir(path): - writemsg((_("Repository '%(repo_name)s' is implicitly using " + warnings.warn(_("Repository '%(repo_name)s' is implicitly using " "'portage-1' profile format in its profiles/package.mask, but " "the repository profiles are not marked as that format. This will break " "in the future. Please either convert the following paths " "to files, or add\nprofile-format = portage-1\nto the " "repositories layout.conf.\n") - % dict(repo_name=repo_config.name)), - noiselevel=-1) + % dict(repo_name=repo_config.name)) return pmask_cache[loc] |