r00t2/optools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

whoops! forgot -p for json and xml.

Browse Source
This commit is contained in:
brent s 2018-09-27 14:40:47 -04:00
parent e1eefebf9d
commit fa2fda8054
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
centos/list_pkgs.py
View File

@ -96,7 +96,10 @@ class PkgIndexer(object):
def _gen_json(self): def _gen_json(self):
import json import json
self.report = json.dumps(self.pkgs, default = str, indent = 4) if self.args['plain']:
self.report = json.dumps([p['name'] for p in self.pkgs], indent = 4)
else:
self.report = json.dumps(self.pkgs, default = str, indent = 4)
return() return()
def _gen_xml(self): def _gen_xml(self):
@ -106,7 +109,10 @@ class PkgIndexer(object):
_attrib = copy.deepcopy(p) _attrib = copy.deepcopy(p)
for i in ('built', 'installed', 'sizerpm', 'sizedisk'): for i in ('built', 'installed', 'sizerpm', 'sizedisk'):
_attrib[i] = str(_attrib[i]) _attrib[i] = str(_attrib[i])
_pkg = etree.Element('package', attrib = _attrib) if self.args['plain']:
_pkg = etree.Element('package', attrib = {'name': p['name']})
else:
_pkg = etree.Element('package', attrib = _attrib)
_xml.append(_pkg) _xml.append(_pkg)
#del(_attrib['name']) # I started to make it a more complex, nested structure... is that necessary? #del(_attrib['name']) # I started to make it a more complex, nested structure... is that necessary?
if self.args['header']: if self.args['header']: