summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:10:29 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:10:29 +0000
commit2d8bc90d1d8161ed2c0684444d9ddd4dfedf45e4 (patch)
tree9d70151911bb5bc5677744e153e3e6dd7889afb8
parentEnsure that the correct PORTDIR setting is passed into the profile-specific (diff)
downloadportage-multirepo-2d8bc90d1d8161ed2c0684444d9ddd4dfedf45e4.tar.gz
portage-multirepo-2d8bc90d1d8161ed2c0684444d9ddd4dfedf45e4.tar.bz2
portage-multirepo-2d8bc90d1d8161ed2c0684444d9ddd4dfedf45e4.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. (trunk r13340) svn path=/main/branches/2.1.6/; revision=13498
-rwxr-xr-xbin/repoman6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 46fdae0f..5a27b95c 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)