summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-22 12:30:55 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-22 12:30:55 +0000
commitc316b60d59db592037c163a8c06908ac05988e5c (patch)
tree44e1f2b9eb20da5499cf4e7654d9e61129dd2081 /bin
parentAvoid a TypeError when commitmessagefile is None. (trunk r6028:6029) (diff)
downloadportage-multirepo-c316b60d59db592037c163a8c06908ac05988e5c.tar.gz
portage-multirepo-c316b60d59db592037c163a8c06908ac05988e5c.tar.bz2
portage-multirepo-c316b60d59db592037c163a8c06908ac05988e5c.zip
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
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 8d7e1346..bdd04b08 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: