Open all wrapdb urls via the same code path.

pull/297/head
Jussi Pakkanen 9 years ago
parent 0c63556286
commit 2056426b47
  1. 13
      wraptool.py

@ -95,11 +95,14 @@ def build_ssl_context():
ctx.load_verify_locations(cadata=wrapdb_certificate) ctx.load_verify_locations(cadata=wrapdb_certificate)
return ctx return ctx
def get_result(urlstring): def open_wrapdburl(urlstring):
if has_ssl: if has_ssl:
u = urllib.request.urlopen(urlstring, context=build_ssl_context()) return urllib.request.urlopen(urlstring, context=build_ssl_context())
else: else:
u = urllib.request.urlopen(urlstring) return urllib.request.urlopen(urlstring)
def get_result(urlstring):
u = open_wrapdburl(urlstring)
data = u.read().decode('utf-8') data = u.read().decode('utf-8')
jd = json.loads(data) jd = json.loads(data)
if jd['output'] != 'ok': if jd['output'] != 'ok':
@ -141,7 +144,7 @@ def install(name):
print('Wrap file already exists.') print('Wrap file already exists.')
sys.exit(1) sys.exit(1)
(branch, revision) = get_latest_version(name) (branch, revision) = get_latest_version(name)
u = urllib.request.urlopen(API_ROOT + 'projects/%s/%s/%s/get_wrap' % (name, branch, revision)) u = open_wrapdburl(API_ROOT + 'projects/%s/%s/%s/get_wrap' % (name, branch, revision))
data = u.read() data = u.read()
open(wrapfile, 'wb').write(data) open(wrapfile, 'wb').write(data)
print('Installed', name, 'branch', branch, 'revision', revision) print('Installed', name, 'branch', branch, 'revision', revision)
@ -169,7 +172,7 @@ def update(name):
if new_branch == branch and new_revision == revision: if new_branch == branch and new_revision == revision:
print('Project', name, 'is already up to date.') print('Project', name, 'is already up to date.')
sys.exit(0) sys.exit(0)
u = urllib.request.urlopen(API_ROOT + 'projects/%s/%s/%d/get_wrap' % (name, new_branch, new_revision)) u = open_wrapdburl(API_ROOT + 'projects/%s/%s/%d/get_wrap' % (name, new_branch, new_revision))
data = u.read() data = u.read()
shutil.rmtree(os.path.join('subprojects', subdir), ignore_errors=True) shutil.rmtree(os.path.join('subprojects', subdir), ignore_errors=True)
try: try:

Loading…
Cancel
Save