summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:18:51 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:18:51 +0000
commit458c3d11cb2d856ee06404179f881b43ca661b79 (patch)
tree16e606aafc79a7abe4ec6a986c3256f422a8546f
parentIf a repo doesn't have metadata/layout.conf then use either missing eclass (diff)
downloadportage-multirepo-458c3d11cb2d856ee06404179f881b43ca661b79.tar.gz
portage-multirepo-458c3d11cb2d856ee06404179f881b43ca661b79.tar.bz2
portage-multirepo-458c3d11cb2d856ee06404179f881b43ca661b79.zip
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
-rw-r--r--pym/portage/dbapi/porttree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 2be49d58..318d00c1 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')