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

remove changes not relevant to cli

Browse source
This commit is contained in:
Tomas Kopecek 2017-05-12 11:23:10 +02:00
parent d2ab86584a
commit d625c0aa4d
33 changed files with 359 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/koji
View file

@ -1863,7 +1863,7 @@ def _import_comps(session, filename, tag, options):
if pkg.type == libcomps.PACKAGE_TYPE_CONDITIONAL:
pkgopts['requires'] = pkg.requires
for k in pkgopts.keys():
if isinstance(pkgopts[k], unicode):
if six.PY2 and isinstance(pkgopts[k], unicode):
pkgopts[k] = str(pkgopts[k])
s_opts = ', '.join(["'%s': %r" % (k, pkgopts[k]) for k in sorted(list(pkgopts.keys()))])
print(" Package: %s: {%s}" % (pkg.name, s_opts))
@ -1896,7 +1896,7 @@ def _import_comps_alt(session, filename, tag, options):
if ptype == 'conditional':
pkgopts['requires'] = pdata[pkg]
for k in pkgopts.keys():
if isinstance(pkgopts[k], unicode):
if six.PY2 and isinstance(pkgopts[k], unicode):
pkgopts[k] = str(pkgopts[k])
s_opts = ', '.join(["'%s': %r" % (k, pkgopts[k]) for k in sorted(list(pkgopts.keys()))])
print(" Package: %s: {%s}" % (pkg, s_opts))