From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 14 Sep 2011 16:08:19 +0000 (-0700)
Subject: repoman: fix KeyError from digestgen with symlink
X-Git-Tag: v2.2.0_alpha57~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1eb8e75ba4cb192607a896ad7b72bf8b525740a;p=portage.git

repoman: fix KeyError from digestgen with symlink
---

diff --git a/bin/repoman b/bin/repoman
index e0cdf6ed4..2180f641a 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -648,6 +648,13 @@ for x in range(0, repolevel - 1):
 	repodir = os.path.dirname(repodir)
 repodir = os.path.realpath(repodir)
 
+# Make startdir relative to the cannonical repodir, so that we can pass
+# it to digestgen and it won't have to be cannonicalized again.
+if repolevel == 1:
+	startdir = repodir
+else:
+	startdir = os.path.join(repodir, *startdir.split(os.sep)[-2-repolevel+3:])
+
 def caterror(mycat):
 	err(mycat+" is not an official category.  Skipping QA checks in this directory.\nPlease ensure that you add "+catdir+" to "+repodir+"/profiles/categories\nif it is a new category.")