| |
@@ -47,6 +47,7 @@
|
| |
from optparse import SUPPRESS_HELP, OptionParser
|
| |
|
| |
import Cheetah.Template
|
| |
+ import requests
|
| |
import rpm
|
| |
import six
|
| |
import six.moves.xmlrpc_client
|
| |
@@ -6328,7 +6329,7 @@
|
| |
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:
|
| |
@@ -6336,7 +6337,7 @@
|
| |
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
|
| |
@@ -6362,7 +6363,7 @@
|
| |
#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))
|
| |
It is broken in startup function for kojid and kojivmd from the
introduction of requests.
Fixes: https://pagure.io/koji/issue/1914