Rework adl-submit.py so it can be used as a library
This commit is contained in:
parent
68c8287d2f
commit
7c6fa54271
@ -369,28 +369,33 @@ def SubmitEvent(event, testOutputFile):
|
|||||||
finally:
|
finally:
|
||||||
curl.close()
|
curl.close()
|
||||||
|
|
||||||
|
def ensure_latest_version_is_used():
|
||||||
|
# Check that we are running the latest version of the adl-submit
|
||||||
|
# script
|
||||||
|
contents = io.BytesIO()
|
||||||
|
curl = pycurl.Curl()
|
||||||
|
try:
|
||||||
|
curl.setopt(curl.WRITEDATA, contents)
|
||||||
|
curl.setopt (curl.URL, baseUrl + './adl-submit-latest-version')
|
||||||
|
curl.perform()
|
||||||
|
if curl.getinfo(curl.HTTP_CODE) == 200:
|
||||||
|
contents = contents.getvalue().decode()
|
||||||
|
if float(contents) != float('3.5'):
|
||||||
|
print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse")
|
||||||
|
print(("%sadl-submit.py") % baseUrl)
|
||||||
|
sys.exit(1)
|
||||||
|
finally:
|
||||||
|
curl.close()
|
||||||
|
|
||||||
if (len(sys.argv) <= 1) or sys.argv[1] == "--help":
|
|
||||||
Usage()
|
|
||||||
|
|
||||||
(event, testOutputFile) = ParseOptions(sys.argv[1:])
|
|
||||||
|
|
||||||
# Check that we are running the latest version of the adl-submit
|
if __name__ == "__main__":
|
||||||
# script
|
if (len(sys.argv) <= 1) or sys.argv[1] == "--help":
|
||||||
contents = io.BytesIO()
|
Usage()
|
||||||
curl = pycurl.Curl()
|
|
||||||
try:
|
|
||||||
curl.setopt(curl.WRITEDATA, contents)
|
|
||||||
curl.setopt (curl.URL, baseUrl + './adl-submit-latest-version')
|
|
||||||
curl.perform()
|
|
||||||
if curl.getinfo(curl.HTTP_CODE) == 200:
|
|
||||||
contents = contents.getvalue().decode()
|
|
||||||
if float(contents) != float('3.5'):
|
|
||||||
print("Votre script n'est plus à jour, merci de télécharger la nouvelle version à l'adresse")
|
|
||||||
print(("%sadl-submit.py") % baseUrl)
|
|
||||||
sys.exit(1)
|
|
||||||
finally:
|
|
||||||
curl.close()
|
|
||||||
|
|
||||||
SubmitEvent(event, testOutputFile)
|
(event, testOutputFile) = ParseOptions(sys.argv[1:])
|
||||||
|
|
||||||
|
ensure_latest_version_is_used()
|
||||||
|
|
||||||
|
SubmitEvent(event, testOutputFile)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user