From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Feb 2007 12:30:55 +0000 (-0000)
Subject: Use startdir instead of mydir since mydir has a trailing slash which triggers normali... 
X-Git-Tag: v2.1.2.1~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c316b60d59db592037c163a8c06908ac05988e5c;p=portage.git

Use startdir instead of mydir since mydir has a trailing slash which triggers normalization issues with the dirname function. (trunk r6030:6031)

svn path=/main/branches/2.1.2/; revision=6032
---

diff --git a/bin/repoman b/bin/repoman
index 8d7e1346d..bdd04b088 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1663,7 +1663,7 @@ else:
 				del myfiles[x]
 		mydone=[]
 		if repolevel==3:   # In a package dir
-			repoman_settings["O"] = mydir
+			repoman_settings["O"] = startdir
 			portage.digestgen([], repoman_settings, manifestonly=1,
 				myportdb=portdb)
 		elif repolevel==2: # In a category dir
@@ -1674,7 +1674,7 @@ else:
 				if xs[0] in mydone:
 					continue
 				mydone.append(xs[0])
-				repoman_settings["O"] = os.path.join(mydir, xs[0])
+				repoman_settings["O"] = os.path.join(startdir, xs[0])
 				portage.digestgen([], repoman_settings, manifestonly=1,
 					myportdb=portdb)
 		elif repolevel==1: # repo-cvsroot
@@ -1686,7 +1686,7 @@ else:
 				if "/".join(xs[:2]) in mydone:
 					continue
 				mydone.append("/".join(xs[:2]))
-				repoman_settings["O"] = os.path.join(mydir, xs[0], xs[1])
+				repoman_settings["O"] = os.path.join(startdir, xs[0], xs[1])
 				portage.digestgen([], repoman_settings, manifestonly=1,
 					myportdb=portdb)
 		else: