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

cli: rename _unique_path to unique_path, and deprecate the old one

Browse source
This commit is contained in:
Yuming Zhu 2018-06-22 13:42:47 +08:00 • committed by Mike McLean
parent 967704b9a3
commit 1c76cd0c0f
11 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cli/koji_cli/commands.py
View file

@ -39,7 +39,7 @@ from koji_cli.lib import _, OptionParser, activate_session, parse_arches, \
_unique_path, _running_in_bg, _progress_callback, watch_tasks, \
arg_filter, linked_upload, list_task_output_all_volumes, \
print_task_headers, print_task_recurse, download_file, watch_logs, \
error, greetings, _list_tasks
error, greetings, _list_tasks, unique_path
def _printable_unicode(s):
@ -485,7 +485,7 @@ def handle_build(options, session, args):
#treat source as an srpm and upload it
if not build_opts.quiet:
print("Uploading srpm: %s" % source)
serverdir = _unique_path('cli-build')
serverdir = unique_path('cli-build')
if _running_in_bg() or build_opts.noprogress or build_opts.quiet:
callback = None
else:
@ -1179,7 +1179,7 @@ def handle_import(goptions, session, args):
if options.test:
print(_("Test mode -- skipping import for %s") % path)
return
serverdir = _unique_path('cli-import')
serverdir = unique_path('cli-import')
if options.link:
linked_upload(path, serverdir)
else:
@ -1299,7 +1299,7 @@ def handle_import_cg(goptions, session, args):
# get upload path
# XXX - need a better way
serverdir = _unique_path('cli-import')
serverdir = unique_path('cli-import')
for localpath, info in to_upload:
relpath = os.path.join(serverdir, info.get('relpath', ''))
@ -2159,7 +2159,7 @@ def handle_import_archive(options, session, args):
for filepath in args[1:]:
filename = os.path.basename(filepath)
print("Uploading archive: %s" % filename)
serverdir = _unique_path('cli-import')
serverdir = unique_path('cli-import')
if _running_in_bg() or suboptions.noprogress:
callback = None
else:
@ -5594,7 +5594,7 @@ def _build_image_indirection(options, task_opts, session, args):
# only scratch builds can omit indirection_template_url
raise koji.GenericError(_("Non-scratch builds must provide a URL for the indirection template"))
templatefile = task_opts.indirection_template
serverdir = _unique_path('cli-image-indirection')
serverdir = unique_path('cli-image-indirection')
session.uploadWrapper(templatefile, serverdir, callback=callback)
task_opts.indirection_template = os.path.join('work', serverdir,
os.path.basename(templatefile))
@ -5791,7 +5791,7 @@ def _build_image(options, task_opts, session, args, img_type):
ksfile = args[4]
if not task_opts.ksurl:
serverdir = _unique_path('cli-' + img_type)
serverdir = unique_path('cli-' + img_type)
session.uploadWrapper(ksfile, serverdir, callback=callback)
ksfile = os.path.join(serverdir, os.path.basename(ksfile))
print('')
@ -5867,7 +5867,7 @@ def _build_image_oz(options, task_opts, session, args):
# only scratch builds can omit ksurl
raise koji.GenericError(_("Non-scratch builds must provide ksurl"))
ksfile = task_opts.kickstart
serverdir = _unique_path('cli-image')
serverdir = unique_path('cli-image')
session.uploadWrapper(ksfile, serverdir, callback=callback)
task_opts.kickstart = os.path.join('work', serverdir,
os.path.basename(ksfile))
@ -6975,7 +6975,7 @@ def handle_dist_repo(options, session, args):
parser.error(_('allow_missing_signatures and skip_missing_signatures '
'are mutually exclusive'))
activate_session(session, options)
stuffdir = _unique_path('cli-dist-repo')
stuffdir = unique_path('cli-dist-repo')
if task_opts.comps:
if not os.path.exists(task_opts.comps):
parser.error(_('could not find %s') % task_opts.comps)

8
cli/koji_cli/lib.py
View file

@ -402,7 +402,7 @@ def list_task_output_all_volumes(session, task_id):
return dict([fn, ['DEFAULT']] for fn in output)
def _unique_path(prefix):
def unique_path(prefix):
"""Create a unique path fragment by appending a path component
to prefix. The path component will consist of a string of letter and numbers
that is unlikely to be a duplicate, but is not guaranteed to be unique."""
@ -414,6 +414,12 @@ def _unique_path(prefix):
''.join([random.choice(string.ascii_letters) for i in range(8)]))
def _unique_path(prefix):
koji.util.deprecated('_unique_path is deprecated, use unique_path instead.'
' See: https://pagure.io/koji/issue/975')
return unique_path(prefix)
def _format_size(size):
if (size / 1073741824 >= 1):
return "%0.2f GiB" % (size / 1073741824.0)