diff options
| -rw-r--r-- | func/minion/modules/rpms.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/func/minion/modules/rpms.py b/func/minion/modules/rpms.py index 34c4d50..ae26cb4 100644 --- a/func/minion/modules/rpms.py +++ b/func/minion/modules/rpms.py @@ -20,23 +20,25 @@ class RpmModule(func_module.FuncModule): def inventory(self, flatten=True): """ Returns information on all installed packages. - By default, 'flatten' is passed in as True, which makes printouts very clean in diffs - for use by func-inventory. If you are writting another software application, using flatten=False will - prevent the need to parse the returns. + By default, 'flatten' is passed in as True, which makes printouts very + clean in diffs for use by func-inventory. If you are writting another + software application, using flatten=False will prevent the need to + parse the returns. """ + # I have not been able to get flatten=False to work if there + # is more than 491 entries in the dict -- ashcrow ts = rpm.TransactionSet() mi = ts.dbMatch() results = [] for hdr in mi: name = hdr['name'] - epoch = hdr['epoch'] - if epoch is None: - epoch = 0 + epoch = (hdr['epoch'] or 0) version = hdr['version'] release = hdr['release'] arch = hdr['arch'] if flatten: - results.append("%s %s %s %s %s" % (name,epoch,version,release,arch)) + results.append("%s %s %s %s %s" % (name, epoch, version, + release, arch)) else: - results.append([name,epoch,version,release,arch]) + results.append([name, epoch, version, release, arch]) return results |