Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13498 - main/branches/2.1.6/bin
Date: Thu, 30 Apr 2009 07:10:31
Message-Id: E1LzQPd-0007qG-Je@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 07:10:29 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13498
4
5 Modified:
6 main/branches/2.1.6/bin/repoman
7 Log:
8 Create the myreporoot variable from portdir_overlay before doing
9 realpath(portdir_overlay) since otherwise symlinks break the
10 assumptions. Thanks to Thomas Sachau <tommy@g.o> for reporting and
11 troubleshooting. (trunk r13340)
12
13 Modified: main/branches/2.1.6/bin/repoman
14 ===================================================================
15 --- main/branches/2.1.6/bin/repoman 2009-04-30 07:09:55 UTC (rev 13497)
16 +++ main/branches/2.1.6/bin/repoman 2009-04-30 07:10:29 UTC (rev 13498)
17 @@ -440,6 +440,9 @@
18 if portdir is None:
19 sys.exit(1)
20
21 +myreporoot = os.path.basename(portdir_overlay)
22 +myreporoot += mydir[len(portdir_overlay):]
23 +
24 vcs = None
25 if os.path.isdir("CVS"):
26 vcs = "cvs"
27 @@ -515,9 +518,6 @@
28 portdb._aux_cache_keys.clear()
29 portdb._aux_cache_keys.update(["EAPI", "KEYWORDS", "SLOT"])
30
31 -myreporoot = os.path.basename(portdir_overlay)
32 -myreporoot += mydir[len(portdir_overlay):]
33 -
34 reposplit = myreporoot.split(os.path.sep)
35 repolevel = len(reposplit)