Fix default master code so that it doesn't trigger when PORTDIR is empty.

(trunk r13362)

svn path=/main/branches/2.1.6/; revision=13518

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 2be49d58f0f12e33a617cf84c92ee497247748d9..318d00c112baf4375562800d4e39b0c87b68dde2 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -253,7 +253,7 @@ class portdbapi(dbapi):
                                else:
                                        porttrees.append(master_path)
 
-                       if not porttrees:
+                       if not porttrees and path != porttree_root:
                                # Make PORTDIR the default master, but only if our
                                # heuristics suggest that it's necessary.
                                profiles_desc = os.path.join(path, 'profiles', 'profiles.desc')