From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:18:51 +0000 (-0000)
Subject: Fix default master code so that it doesn't trigger when PORTDIR is empty.
X-Git-Tag: v2.1.6.12~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=458c3d11cb2d856ee06404179f881b43ca661b79;p=portage.git

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 2be49d58f..318d00c11 100644
--- 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')