Create the myreporoot variable from portdir_overlay before doing
authorZac Medico <zmedico@gentoo.org>
Sun, 12 Apr 2009 21:23:44 +0000 (21:23 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 12 Apr 2009 21:23:44 +0000 (21:23 -0000)
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

bin/repoman

index e64432a268a12d296785aeda1727d61cfaff653d..f507051744df80ed7e0372a964146a38129d175d 100755 (executable)
@@ -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)