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 080248b8dc69db565baacfaa56bf957e04d8cf79..6f4875f3c61b0b629b57f31727b6721e20a7a581 100644 (file)
--- 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