Commit 89056d32 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 24937b88
...@@ -42,7 +42,8 @@ PkgInfo = namedtuple('PkgInfo', [ ...@@ -42,7 +42,8 @@ PkgInfo = namedtuple('PkgInfo', [
'name', 'name',
'version', 'version',
'kind', 'kind',
'url']) 'url',
'license'])
# TODO patches # TODO patches
...@@ -83,8 +84,8 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo ...@@ -83,8 +84,8 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo
else: else:
raise NotImplementedError('TODO url for kind %r (urlpath: %r)' % (kind, urlpath)) raise NotImplementedError('TODO url for kind %r (urlpath: %r)' % (kind, urlpath))
license = None
info = PkgInfo(name, ver, kind, url) info = PkgInfo(name, ver, kind, url, license)
bkey = (name, kind) bkey = (name, kind)
if bkey in bom: if bkey in bom:
assert bom[bkey] == info, (bom[bkey], info) assert bom[bkey] == info, (bom[bkey], info)
...@@ -490,7 +491,7 @@ def fmt_bom(bom): # -> str ...@@ -490,7 +491,7 @@ def fmt_bom(bom): # -> str
info = bom[bkey] info = bom[bkey]
if info.kind == kind: if info.kind == kind:
# TODO autoalign # TODO autoalign
emit('%-28s %-10s %s' % (info.name, info.version, info.url)) emit('%-28s %-10s %-10s %s' % (info.name, info.version, info.license, info.url))
return ''.join(outv) return ''.join(outv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment