diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-11-24 00:34:17 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-11-24 00:34:17 +0000 |
commit | ea61f3589be3ca08638d0cb548dad746e5ba2dff (patch) | |
tree | 7905453522f0a8bee4333ed545ca6c7d321fa432 /pym/portage/__init__.py | |
parent | 892ece74ccae5681a4b9c2b789c720f2c387c0ff (diff) | |
download | portage-ea61f3589be3ca08638d0cb548dad746e5ba2dff.tar.gz portage-ea61f3589be3ca08638d0cb548dad746e5ba2dff.tar.bz2 portage-ea61f3589be3ca08638d0cb548dad746e5ba2dff.zip |
Make emerge detect an invalid profile an bail out for anything except
--help, --info, --sync, and --version actions. When bailing out, suggest
to revert back to the previous profile configuration advise the user which
actions are allowed with an invalid profile. (trunk r12064:12066)
svn path=/main/branches/2.1.6/; revision=12067
Diffstat (limited to 'pym/portage/__init__.py')
-rw-r--r-- | pym/portage/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index ff40f2f5c..929b82ad2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1220,7 +1220,7 @@ class config(object): writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1) del e self.profiles = [] - if local_config: + if local_config and self.profiles: custom_prof = os.path.join( config_root, CUSTOM_PROFILE_PATH.lstrip(os.path.sep)) if os.path.exists(custom_prof): |