From: Marius Mauch Date: Sat, 6 Oct 2007 13:59:37 +0000 (-0000) Subject: Also look for sets.conf in overlays X-Git-Tag: v2.2_pre1~704 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43e4cd7cc781db317a66523d63ebabd1361c8d88;p=portage.git Also look for sets.conf in overlays svn path=/main/trunk/; revision=7979 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 080248b8d..6f4875f3c 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -6401,8 +6401,10 @@ def emerge_main(): print colorize("BAD", "\n*** emerging by path is broken and may not always work!!!\n") break - setconfigpaths = ["/usr/share/portage/config/sets.conf", os.path.join(settings["PORTDIR"], "sets.conf"), \ - os.path.join(os.sep, settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH, "sets.conf")] + setconfigpaths = ["/usr/share/portage/config/sets.conf"] + setconfigpaths.append(os.path.join(settings["PORTDIR"], "sets.conf")) + setconfigpaths += [os.path.join(x, "sets.conf") for x in settings["PORDIR_OVERLAY"].split()] + setconfigpaths.append(os.path.join(os.sep, settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH, "sets.conf")) #setconfig = SetConfig(setconfigpaths, settings, trees[settings["ROOT"]]) setconfig = make_default_config(settings, trees[settings["ROOT"]]) del setconfigpaths