From 8d7ea946b1fa85fe421d993fad08159d910a68be Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 11 Mar 2013 20:43:09 -0400 Subject: [PATCH] ebuild: reformat user error message to be a bit more readable Signed-off-by: Mike Frysinger --- .../package/ebuild/_config/LocationsManager.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index 95a775134..5057f95d5 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -183,14 +183,17 @@ 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 " - "'%(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") + warnings.warn(_( + "\nThe selected profile is implicitly using the 'portage-1' format:\n" + "\tprofile = %(profile_path)s\n" + "But this repository is not using that format:\n" + "\trepo = %(repo_name)s\n" + "This will break in the future. Please convert these dirs to files:\n" + "\t%(files)s\n" + "Or, add this line to the repository's layout.conf:\n" + "\tprofile-formats = portage-1") % dict(profile_path=currentPath, repo_name=repo_loc, - files=', '.join(offenders))) + files='\n\t'.join(offenders))) parentsFile = os.path.join(currentPath, "parent") if exists_raise_eaccess(parentsFile): -- 2.26.2