Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13579 - main/branches/2.1.6/pym/portage/dbapi
Date: Fri, 01 May 2009 18:36:01
Message-Id: E1LzxaZ-0002cC-Kb@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-05-01 18:35:59 +0000 (Fri, 01 May 2009)
3 New Revision: 13579
4
5 Modified:
6 main/branches/2.1.6/pym/portage/dbapi/porttree.py
7 Log:
8 Fix logic error which prevents repos.conf [DEFAULT] section from applying
9 to repos that don't have their own section. Thanks to Markos Chandras
10 <hwoarang@g.o> for reporting. (trunk r13578)
11
12 Modified: main/branches/2.1.6/pym/portage/dbapi/porttree.py
13 ===================================================================
14 --- main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-05-01 18:34:59 UTC (rev 13578)
15 +++ main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-05-01 18:35:59 UTC (rev 13579)
16 @@ -227,7 +227,7 @@
17 if local_repo_configs is not None:
18 if repo_name is not None:
19 loc_repo_conf = local_repo_configs.get(repo_name)
20 - else:
21 + if loc_repo_conf is None:
22 loc_repo_conf = default_loc_repo_config
23
24 layout_filename = os.path.join(path, "metadata/layout.conf")