summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-03-27 02:42:49 +0000
committerMarius Mauch <genone@gentoo.org>2006-03-27 02:42:49 +0000
commit2100df431cfb51ba25a020377ec4c3dd4d220f47 (patch)
treebd08a6d8e7827b5eacdabe483183f7f56340edd9
parent19a107d29e4d6cfe05b8bc47fb9e6264606ee3f9 (diff)
downloadportage-2100df431cfb51ba25a020377ec4c3dd4d220f47.tar.gz
portage-2100df431cfb51ba25a020377ec4c3dd4d220f47.tar.bz2
portage-2100df431cfb51ba25a020377ec4c3dd4d220f47.zip
fix some nasty repoman tricks causing problems (always use absolute paths with manifest2 code)
svn path=/main/trunk/; revision=3020
-rwxr-xr-xbin/repoman6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 4c6439e1d..54a1da79e 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1590,7 +1590,7 @@ else:
del myfiles[x]
mydone=[]
if repolevel==3: # In a package dir
- repoman_settings["O"]="./"
+ repoman_settings["O"]=os.getcwd()
portage.digestgen([],repoman_settings,manifestonly=1)
elif repolevel==2: # In a category dir
for x in myfiles:
@@ -1600,7 +1600,7 @@ else:
if xs[0] in mydone:
continue
mydone.append(xs[0])
- repoman_settings["O"]="./"+xs[0]
+ repoman_settings["O"]=os.path.join(os.getcwd(), xs[0])
portage.digestgen([],repoman_settings,manifestonly=1)
elif repolevel==1: # repo-cvsroot
print green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n"
@@ -1611,7 +1611,7 @@ else:
if string.join(xs[:2],"/") in mydone:
continue
mydone.append(string.join(xs[:2],"/"))
- repoman_settings["O"]="./"+string.join(xs[:2],"/")
+ repoman_settings["O"]=os.path.join(os.getcwd(), x[0], x[1])
portage.digestgen([],repoman_settings,manifestonly=1)
else:
print red("I'm confused... I don't know where I am!")