X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=curlwrapper.py;h=81c9c1411468a0a8c906b3f34d0006440ac6bb3d;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=3bfe491fc704e1f3ff201aaf24a919541a76bd52;hpb=3224c1906c82596a86ae734181488ed14a0f0976;p=nodemanager.git diff --git a/curlwrapper.py b/curlwrapper.py index 3bfe491..81c9c14 100644 --- a/curlwrapper.py +++ b/curlwrapper.py @@ -14,7 +14,8 @@ class Sopen(Popen): os.kill(self.pid, signal) def retrieve(url, cacert=None, postdata=None, timeout=90): - options = ('/usr/bin/curl', '--fail', '--silent') +# options = ('/usr/bin/curl', '--fail', '--silent') + options = ('/usr/bin/curl', '--fail', ) if cacert: options += ('--cacert', cacert) if postdata: options += ('--data', '@-') if timeout: @@ -32,6 +33,7 @@ def retrieve(url, cacert=None, postdata=None, timeout=90): rc = p.wait() if rc != 0: # when this triggers, the error sometimes doesn't get printed + logger.log ("curlwrapper: retrieve, got stderr <%s>"%err) raise xmlrpclib.ProtocolError(url, rc, err, postdata) else: return data