diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-01-29 16:19:45 -0500 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-01-29 16:19:45 -0500 |
commit | 168f3ec79a2fbee4addf5e4d131a46325ad9c231 (patch) | |
tree | 7801f2c156ec266a8c5f41aae446013998fa3e2e /func/minion | |
parent | b3c5591d70c1c354d14267e804ab64872af97b40 (diff) | |
parent | 41766553ea364808ed336066a758d3366d040fe3 (diff) | |
download | func-168f3ec79a2fbee4addf5e4d131a46325ad9c231.tar.gz func-168f3ec79a2fbee4addf5e4d131a46325ad9c231.tar.xz func-168f3ec79a2fbee4addf5e4d131a46325ad9c231.zip |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'func/minion')
-rwxr-xr-x | func/minion/module_loader.py | 10 | ||||
-rw-r--r-- | func/minion/modules/rpms.py | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/func/minion/module_loader.py b/func/minion/module_loader.py index 37bc515..3068ea8 100755 --- a/func/minion/module_loader.py +++ b/func/minion/module_loader.py @@ -32,9 +32,6 @@ def module_walker(topdir): for filename in files: # ASSUMPTION: all module files will end with .py, .pyc, .pyo if filename[-3:] == ".py" or filename[-4:] == ".pyc" or filename[-4:] == ".pyo": - # we don't really care about __init__ files, though we do requure them - if filename[:8] == "__init__": - continue # the normpath is important, since we eventually replace /'s with .'s # in the module name, and foo..bar doesnt work -akl module_files.append(os.path.normpath("%s/%s" % (root, filename))) @@ -59,9 +56,10 @@ def load_modules(blacklist=None): module_name_part = fn[len(module_file_path):] dirname, basename = os.path.split(module_name_part) - if basename == "__init__.py": - continue - if basename[-3:] == ".py": + if basename[:8] == "__init__": + modname = dirname + dirname = "" + elif basename[-3:] == ".py": modname = basename[:-3] elif basename[-4:] in [".pyc", ".pyo"]: modname = basename[:-4] 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 |