x/cloud-init
Code Issues Proposed changes

Use os.path.join instead of custom string path formation

Browse Source
This commit is contained in:
Joshua Harlow 2012-06-22 23:36:08 -07:00
parent cf2745ebfc
commit 46baea3ead
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudinit/config/cc_apt_update_upgrade.py
View File

@ -133,7 +133,7 @@ def getkeybyid(keyid, keyserver):
def mirror2lists_fileprefix(mirror):
string = mirror
# take of http:// or ftp://
# take off http:// or ftp://
if string.endswith("/"):
string = string[0:-1]
pos = string.find("://")
@ -144,8 +144,8 @@ def mirror2lists_fileprefix(mirror):
def rename_apt_lists(omirror, new_mirror, lists_d="/var/lib/apt/lists"):
oprefix = "%s/%s" % (lists_d, mirror2lists_fileprefix(omirror))
nprefix = "%s/%s" % (lists_d, mirror2lists_fileprefix(new_mirror))
oprefix = os.path.join(lists_d, mirror2lists_fileprefix(omirror))
nprefix = os.path.join(lists_d, mirror2lists_fileprefix(new_mirror))
if oprefix == nprefix:
return
olen = len(oprefix)