Merge branch 'upload_blocksize'

Conflicted with the recent profiles changes. Option defaults now live in koji/__init__.py
This commit is contained in:
Mike McLean 2016-03-24 15:06:41 -04:00
commit acbe00ff1b
2 changed files with 13 additions and 4 deletions

View file

@ -157,6 +157,7 @@ def get_options():
parser.add_option("--weburl", help=_("url of the Koji web interface"))
parser.add_option("--topurl", help=_("url for Koji file access"))
parser.add_option("--pkgurl", help=optparse.SUPPRESS_HELP)
parser.add_option("--upload-blocksize", help=_("upload the koji hub how many bytes per request"))
parser.add_option("--help-commands", action="store_true", default=False, help=_("list commands"))
(options, args) = parser.parse_args()
@ -6865,8 +6866,9 @@ if __name__ == "__main__":
session_opts = {}
for k in ('user', 'password', 'krbservice', 'debug_xmlrpc', 'debug', 'max_retries',
'retry_interval', 'offline_retry', 'offline_retry_interval',
'anon_retry', 'keepalive', 'timeout', 'use_fast_upload'):
'retry_interval', 'offline_retry', 'offline_retry_interval',
'anon_retry', 'keepalive', 'timeout', 'use_fast_upload',
'upload_blocksize'):
value = getattr(options,k)
if value is not None:
session_opts[k] = value