particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace xmlrpc_client exception with requests

Browse source 
It is broken in startup function for kojid and kojivmd from the
introduction of requests.

Fixes: https://pagure.io/koji/issue/1914
This commit is contained in:
Tomas Kopecek 2020-01-06 14:37:00 +01:00
parent c30c4a48fd
commit 638f6cc6f2
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
builder/kojid
View file

@ -47,6 +47,7 @@ from gzip import GzipFile
from optparse import SUPPRESS_HELP, OptionParser
import Cheetah.Template
import requests
import rpm
import six
import six.moves.xmlrpc_client
@ -6335,7 +6336,7 @@ if __name__ == "__main__":
options.serverca)
except koji.AuthError as e:
quit("Error: Unable to log in: %s" % e)
except six.moves.xmlrpc_client.ProtocolError:
except requests.exceptions.ConnectionError:
quit("Error: Unable to connect to server %s" % (options.server))
elif options.user:
try:
@ -6343,7 +6344,7 @@ if __name__ == "__main__":
session.login()
except koji.AuthError:
quit("Error: Unable to log in. Bad credentials?")
except six.moves.xmlrpc_client.ProtocolError:
except requests.exceptions.ConnectionError:
quit("Error: Unable to connect to server %s" % (options.server))
elif krbV or requests_kerberos:
krb_principal = options.krb_principal
@ -6369,7 +6370,7 @@ if __name__ == "__main__":
#make sure it works
try:
ret = session.echo("OK")
except six.moves.xmlrpc_client.ProtocolError:
except requests.exceptions.ConnectionError:
quit("Error: Unable to connect to server %s" % (options.server))
if ret != ["OK"]:
quit("Error: incorrect server response: %r" % (ret))