From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Apr 2009 21:23:44 +0000 (-0000)
Subject: Create the myreporoot variable from portdir_overlay before doing
X-Git-Tag: v2.2_rc31~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbf94573a662bebf68d0782a7ee01557820f54ec;p=portage.git

Create the myreporoot variable from portdir_overlay before doing
realpath(portdir_overlay) since otherwise symlinks break the
assumptions. Thanks to Thomas Sachau <tommy@g.o> for reporting and
troubleshooting.

svn path=/main/trunk/; revision=13340
---

diff --git a/bin/repoman b/bin/repoman
index e64432a26..f50705174 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -440,6 +440,9 @@ portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
 if portdir is None:
 	sys.exit(1)
 
+myreporoot = os.path.basename(portdir_overlay)
+myreporoot += mydir[len(portdir_overlay):]
+
 vcs = None
 if os.path.isdir("CVS"):
 	vcs = "cvs"
@@ -515,9 +518,6 @@ root_config = RootConfig(repoman_settings, trees[root], None)
 portdb._aux_cache_keys.clear()
 portdb._aux_cache_keys.update(["EAPI", "KEYWORDS", "SLOT"])
 
-myreporoot = os.path.basename(portdir_overlay)
-myreporoot += mydir[len(portdir_overlay):]
-
 reposplit = myreporoot.split(os.path.sep)
 repolevel = len(reposplit)