Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13518 - main/branches/2.1.6/pym/portage/dbapi
Date: Thu, 30 Apr 2009 07:18:54
Message-Id: E1LzQXj-0000XG-Qx@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 07:18:51 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13518
4
5 Modified:
6 main/branches/2.1.6/pym/portage/dbapi/porttree.py
7 Log:
8 Fix default master code so that it doesn't trigger when PORTDIR is empty.
9 (trunk r13362)
10
11 Modified: main/branches/2.1.6/pym/portage/dbapi/porttree.py
12 ===================================================================
13 --- main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-04-30 07:18:41 UTC (rev 13517)
14 +++ main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-04-30 07:18:51 UTC (rev 13518)
15 @@ -253,7 +253,7 @@
16 else:
17 porttrees.append(master_path)
18
19 - if not porttrees:
20 + if not porttrees and path != porttree_root:
21 # Make PORTDIR the default master, but only if our
22 # heuristics suggest that it's necessary.
23 profiles_desc = os.path.join(path, 'profiles', 'profiles.desc')