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

use grab_session_options everywhere

Browse source
This commit is contained in:
Mike McLean 2016-10-13 22:55:37 -04:00
parent ef790857ad
commit 89ca42f224
4 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
builder/kojid
View file

@ -5074,16 +5074,8 @@ if __name__ == "__main__":
if options.admin_emails:
koji.add_mail_logger("koji", options.admin_emails)
#build session options
session_opts = {}
for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval',
'keepalive', 'timeout', 'use_fast_upload',
):
v = getattr(options, k, None)
if v is not None:
session_opts[k] = v
#start a session and login
session_opts = koji.grab_session_options(options)
session = koji.ClientSession(options.server, session_opts)
if os.path.isfile(options.cert):
try:

4
util/koji-shadow
View file

@ -1326,9 +1326,7 @@ if __name__ == "__main__":
options, args = get_options()
session_opts = {}
for k in ('user', 'password', 'krbservice', 'debug_xmlrpc', 'debug'):
session_opts[k] = getattr(options, k)
session_opts = koji.grab_session_options(options)
session = koji.ClientSession(options.server, session_opts)
if not options.noauth:
activate_session(session)

6
util/kojira
View file

@ -791,10 +791,8 @@ if __name__ == "__main__":
logger.setLevel(logging.ERROR)
else:
logger.setLevel(logging.WARNING)
session_opts = {}
for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval'):
session_opts[k] = getattr(options,k)
session_opts = koji.grab_session_options(options)
session = koji.ClientSession(options.server,session_opts)
if os.path.isfile(options.cert):
# authenticate using SSL client certificates

8
vm/kojivmd
View file

@ -1055,14 +1055,8 @@ if __name__ == "__main__":
if options.admin_emails:
koji.add_mail_logger("koji", options.admin_emails)
#build session options
session_opts = {}
for k in ('user', 'password', 'krbservice', 'krb_rdns', 'debug_xmlrpc', 'debug',
'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval'):
v = getattr(options, k, None)
if v is not None:
session_opts[k] = v
#start a session and login
session_opts = koji.grab_session_options(options)
session = koji.ClientSession(options.server, session_opts)
if os.path.isfile(options.cert):
try: