Create the myreporoot variable from portdir_overlay before doing
authorZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 07:10:29 +0000 (07:10 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 07:10:29 +0000 (07:10 -0000)
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

bin/repoman

index 46fdae0f8cedfda33040edba226c1d3ac111d694..5a27b95c2904a3979f929f509ccfcaa58021681e 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)