From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 May 2009 18:35:59 +0000 (-0000)
Subject: Fix logic error which prevents repos.conf [DEFAULT] section from applying
X-Git-Tag: v2.1.6.12~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee93a7d0c9265f6a19c131f41beab7ebde041d59;p=portage.git

Fix logic error which prevents repos.conf [DEFAULT] section from applying
to repos that don't have their own section. Thanks to Markos Chandras
<hwoarang@g.o> for reporting. (trunk r13578)

svn path=/main/branches/2.1.6/; revision=13579
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 318d00c11..2fc55ccc9 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -227,7 +227,7 @@ class portdbapi(dbapi):
 			if local_repo_configs is not None:
 				if repo_name is not None:
 					loc_repo_conf = local_repo_configs.get(repo_name)
-				else:
+				if loc_repo_conf is None:
 					loc_repo_conf = default_loc_repo_config
 
 			layout_filename = os.path.join(path, "metadata/layout.conf")