diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 13:27:41 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 13:27:41 -0400 |
| commit | 6c996f42c53a36fc0406f836d64b8c1bec6f4bcc (patch) | |
| tree | 34d153ff83cc20b19292a6b6c37d9851ce480f23 /src/lib/Bcfg2/Client/Frame.py | |
| parent | 64eec5fe6a9b640bb77dd65f10f3fac5a586347c (diff) | |
| download | bcfg2-6c996f42c53a36fc0406f836d64b8c1bec6f4bcc.tar.gz bcfg2-6c996f42c53a36fc0406f836d64b8c1bec6f4bcc.tar.bz2 bcfg2-6c996f42c53a36fc0406f836d64b8c1bec6f4bcc.zip | |
testsuite: fixed issues found by latest version of pylint
Diffstat (limited to 'src/lib/Bcfg2/Client/Frame.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Frame.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index ad5447736..fe4943fdf 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -310,10 +310,10 @@ class Frame(object): for bundle in self.setup['bundle']: if bundle not in all_bundle_names: self.logger.info("Warning: Bundle %s not found" % bundle) - bundles = filter(lambda b: b.get('name') in self.setup['bundle'], - bundles) + bundles = [b for b in bundles + if b.get('name') in self.setup['bundle']] elif self.setup['indep']: - bundles = filter(lambda b: b.tag != 'Bundle', bundles) + bundles = [b for b in bundles if b.tag != 'Bundle'] if self.setup['skipbundle']: # warn if non-existent bundle given if not self.setup['bundle_quick']: @@ -321,14 +321,13 @@ class Frame(object): if bundle not in all_bundle_names: self.logger.info("Warning: Bundle %s not found" % bundle) - bundles = filter(lambda b: \ - b.get('name') not in self.setup['skipbundle'], - bundles) + bundles = [b for b in bundles + if b.get('name') not in self.setup['skipbundle']] if self.setup['skipindep']: - bundles = filter(lambda b: b.tag == 'Bundle', bundles) + bundles = [b for b in bundles if b.tag == 'Bundle'] self.whitelist = [e for e in self.whitelist - if True in [e in b for b in bundles]] + if any(e in b for b in bundles)] # first process prereq actions for bundle in bundles[:]: |