summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-10 08:51:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-10 08:51:49 +0000
commit9609b95e35a49157801138fb12ad72e7521fae86 (patch)
tree59292dbdd9e0f3c602615a3e0188ff62ee95ae6c
parent2437617c019ec830b94b7770b17c97a9d1437cd0 (diff)
downloadportage-9609b95e35a49157801138fb12ad72e7521fae86.tar.gz
portage-9609b95e35a49157801138fb12ad72e7521fae86.tar.bz2
portage-9609b95e35a49157801138fb12ad72e7521fae86.zip
Use os.path.join for cleaner joins.
svn path=/main/trunk/; revision=3116
-rwxr-xr-xbin/repoman12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index a3cc64f0f..7ad540fc8 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1617,8 +1617,8 @@ else:
if "sign" in portage.features:
mydone=[]
if repolevel==3: # In a package dir
- repoman_settings["O"]="./"
- while(gpgsign(repoman_settings["O"]+"/Manifest")):
+ repoman_settings["O"] = "."
+ while(gpgsign(os.path.join(repoman_settings["O"], "Manifest"))):
portage.writemsg("!!! YOU MUST sign the Manifest.\n")
portage.writemsg("!!! You can also disable this for the time being by removing FEATURES='sign'")
time.sleep(3)
@@ -1630,8 +1630,8 @@ else:
if xs[0] in mydone:
continue
mydone.append(xs[0])
- repoman_settings["O"]="./"+xs[0]
- while(gpgsign(repoman_settings["O"]+"/Manifest")):
+ repoman_settings["O"] = os.path.join(".", xs[0])
+ while(gpgsign(os.path.join(repoman_settings["O"], "Manifest"))):
portage.writemsg("!!! YOU MUST sign the Manifest.\n")
portage.writemsg("!!! You can also disable this for the time being by removing FEATURES='sign'")
time.sleep(3)
@@ -1644,8 +1644,8 @@ else:
if string.join(xs[:2],"/") in mydone:
continue
mydone.append(string.join(xs[:2],"/"))
- repoman_settings["O"]="./"+string.join(xs[:2],"/")
- while(gpgsign(repoman_settings["O"]+"/Manifest")):
+ repoman_settings["O"] = os.path.join(".", xs[0], xs[1])
+ while(gpgsign(os.path.join(repoman_settings["O"], "Manifest"))):
portage.writemsg("!!! YOU MUST sign the Manifest.\n")
portage.writemsg("!!! You can also disable this for the time being by removing FEATURES='sign'")
time.sleep(3)