Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10867 - main/trunk/pym/portage/dbapi
Date: Tue, 01 Jul 2008 08:43:17
Message-Id: E1KDbSB-0002k1-Qt@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-07-01 08:43:10 +0000 (Tue, 01 Jul 2008)
3 New Revision: 10867
4
5 Modified:
6 main/trunk/pym/portage/dbapi/porttree.py
7 Log:
8 Never do realpath() on an empty string for portdbapi.porttree_root since
9 otherwise it can evaluate to $CWD which leads to undesireable results.
10
11
12 Modified: main/trunk/pym/portage/dbapi/porttree.py
13 ===================================================================
14 --- main/trunk/pym/portage/dbapi/porttree.py 2008-07-01 08:29:41 UTC (rev 10866)
15 +++ main/trunk/pym/portage/dbapi/porttree.py 2008-07-01 08:43:10 UTC (rev 10867)
16 @@ -63,7 +63,9 @@
17 self.manifestVerifier = portage.gpg.FileChecker(self.mysettings["PORTAGE_GPG_DIR"], "gentoo.gpg", minimumTrust=self.manifestVerifyLevel)
18
19 #self.root=settings["PORTDIR"]
20 - self.porttree_root = os.path.realpath(porttree_root)
21 + self.porttree_root = porttree_root
22 + if porttree_root:
23 + self.porttree_root = os.path.realpath(porttree_root)
24
25 self.depcachedir = os.path.realpath(self.mysettings.depcachedir)
26
27
28 --
29 gentoo-commits@l.g.o mailing list