opendev/system-config
Code Issues Proposed changes

Fix magic in zuul_swift_upload

Browse Source 
It turns out there are two implementations of libmagic for python.
PyPI has a wrapper (https://github.com/ahupp/python-magic) and
ubuntu packages the bindings from (https://github.com/file/file).

Update zuul_swift_upload to try the wrapper first and fall back to
the bindings. If both don't work an exception should be raised.

Change-Id: I248163d610b074c6de8a6408a6c458d3198d18cc
This commit is contained in:
Joshua Hesketh 2014-07-03 11:46:00 +10:00
parent a6e20ecef2
commit eb23cf5992
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/files/slave_scripts/zuul_swift_upload.py
View File

@ -78,8 +78,16 @@ def swift_form_post_submit(file_list, url, hmac_body, signature):
files = {}
for i, f in enumerate(file_list):
try:
file_mime = magic.from_file(f['path'], mime=True)
except AttributeError:
# no magic.from_file, we might be using the libmagic bindings
m = magic.open(magic.MIME)
m.load()
file_mime = m.file(f['path']).split(';')[0]
files['file%d' % (i + 1)] = (f['filename'], open(f['path'], 'rb'),
magic.from_file(f['path'], mime=True))
file_mime)
requests.post(url, data=payload, files=files)