From 34d8c817080f34f1a0b44cf05b99beacfc0d6314 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 10 Feb 2013 19:06:20 -0800 Subject: [PATCH] deprecated_profile_check: suggest portage upgrade If the new profile can't be parsed due to unsupported EAPI, then show a warning like this: !!! Your current profile is deprecated and not supported anymore. !!! Use eselect profile to update your profile. !!! Please upgrade to the following profile if possible: default/linux/x86/13.0/desktop !!! Unable to parse profile: '/usr/portage/profiles/default/linux/x86/13.0/desktop' !!! ParseError: Profile contains unsupported EAPI '5': '/usr/portage/profiles/eapi-5-files/eapi' * You must update portage before you can migrate to the above profile. * In order to update portage, run 'emerge --oneshot portage'. --- .../ebuild/deprecated_profile_check.py | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/deprecated_profile_check.py b/pym/portage/package/ebuild/deprecated_profile_check.py index 2acf8e3c2..2621ce71d 100644 --- a/pym/portage/package/ebuild/deprecated_profile_check.py +++ b/pym/portage/package/ebuild/deprecated_profile_check.py @@ -5,6 +5,7 @@ __all__ = ['deprecated_profile_check'] import io +import portage from portage import os, _encodings, _unicode_encode from portage.const import DEPRECATED_PROFILE_FILE from portage.localization import _ @@ -12,10 +13,12 @@ from portage.output import colorize from portage.util import writemsg def deprecated_profile_check(settings=None): - config_root = "/" + config_root = None + eprefix = None deprecated_profile_file = None if settings is not None: config_root = settings["PORTAGE_CONFIGROOT"] + eprefix = settings["EPREFIX"] for x in reversed(settings.profiles): deprecated_profile_file = os.path.join(x, "deprecated") if os.access(deprecated_profile_file, os.R_OK): @@ -24,10 +27,10 @@ def deprecated_profile_check(settings=None): deprecated_profile_file = None if deprecated_profile_file is None: - deprecated_profile_file = os.path.join(config_root, + deprecated_profile_file = os.path.join(config_root or "/", DEPRECATED_PROFILE_FILE) if not os.access(deprecated_profile_file, os.R_OK): - deprecated_profile_file = os.path.join(config_root, + deprecated_profile_file = os.path.join(config_root or "/", 'etc', 'make.profile', 'deprecated') if not os.access(deprecated_profile_file, os.R_OK): return @@ -53,4 +56,24 @@ def deprecated_profile_check(settings=None): for myline in dcontent[1:]: writemsg(myline, noiselevel=-1) writemsg("\n\n", noiselevel=-1) + + if settings is not None: + main_repo_loc = settings.repositories.mainRepoLocation() + new_profile_path = os.path.join(main_repo_loc, + "profiles", newprofile.rstrip("\n")) + + if os.path.isdir(new_profile_path): + new_config = portage.config(config_root=config_root, + config_profile_path=new_profile_path, + eprefix=eprefix) + + if not new_config.profiles: + writemsg("\n %s %s\n" % (colorize("WARN", "*"), + _("You must update portage before you " + "can migrate to the above profile.")), noiselevel=-1) + writemsg(" %s %s\n\n" % (colorize("WARN", "*"), + _("In order to update portage, " + "run 'emerge --oneshot portage'.")), + noiselevel=-1) + return True -- 2.26.2