summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-12 21:23:44 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-12 21:23:44 +0000
commitdbf94573a662bebf68d0782a7ee01557820f54ec (patch)
tree78f792dcd4786a2d40e247af11089eda0cb8da8e
parent7cd8528c63d5be3a86c33610a4463fb4e71fe4f2 (diff)
downloadportage-dbf94573a662bebf68d0782a7ee01557820f54ec.tar.gz
portage-dbf94573a662bebf68d0782a7ee01557820f54ec.tar.bz2
portage-dbf94573a662bebf68d0782a7ee01557820f54ec.zip
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
-rwxr-xr-xbin/repoman6
1 files changed, 3 insertions, 3 deletions
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)