diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:23:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:23:16 +0000 |
| commit | 1f1199ddd971b4fca50eb8bad0081f667a517320 (patch) | |
| tree | ad7b4c80ea2753a92871e36c90051dd5834be02e | |
| parent | Avoid TypeError in BlockerCache.__iter__() that's triggered with (diff) | |
| download | portage-multirepo-1f1199ddd971b4fca50eb8bad0081f667a517320.tar.gz portage-multirepo-1f1199ddd971b4fca50eb8bad0081f667a517320.tar.bz2 portage-multirepo-1f1199ddd971b4fca50eb8bad0081f667a517320.zip | |
Fix deprecated_profile_check() to account for PORTAGE_CONFIGROOT. Thanks to
Jeremy Olexa <darkside@g.o> for the initial patch. (trunk r12181)
svn path=/main/branches/2.1.6/; revision=12217
| -rw-r--r-- | pym/_emerge/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 5acd3be8..33b6732c 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -13742,7 +13742,7 @@ def emerge_main(): spinner.update = spinner.update_scroll if "--quiet" not in myopts: - portage.deprecated_profile_check() + portage.deprecated_profile_check(settings=settings) #repo_name_check(trees) config_protect_check(trees) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 9c2b13f0..3a68ec2f 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7227,10 +7227,15 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, raise del e -def deprecated_profile_check(): - if not os.access(DEPRECATED_PROFILE_FILE, os.R_OK): +def deprecated_profile_check(settings=None): + config_root = "/" + if settings is not None: + config_root = settings["PORTAGE_CONFIGROOT"] + deprecated_profile_file = os.path.join(config_root, + DEPRECATED_PROFILE_FILE.lstrip(os.sep)) + if not os.access(deprecated_profile_file, os.R_OK): return False - deprecatedfile = open(DEPRECATED_PROFILE_FILE, "r") + deprecatedfile = open(deprecated_profile_file, "r") dcontent = deprecatedfile.readlines() deprecatedfile.close() writemsg(red("\n!!! Your current profile is deprecated and not supported anymore.\n"), |