summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Frame.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-07-20 12:56:14 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-07-20 12:56:14 -0500
commitccf69a9bbb88e65a7968452dfbb96ec4a6ebd57f (patch)
tree4719f36dd4c2442720bf3b95e53b909de3a00a74 /src/lib/Bcfg2/Client/Frame.py
parent491fedee8eedbfae39b5b7cc761bbae69d9d3083 (diff)
parentb419ae3065554cf778ad00c44c33416bb8ea1850 (diff)
downloadbcfg2-ccf69a9bbb88e65a7968452dfbb96ec4a6ebd57f.tar.gz
bcfg2-ccf69a9bbb88e65a7968452dfbb96ec4a6ebd57f.tar.bz2
bcfg2-ccf69a9bbb88e65a7968452dfbb96ec4a6ebd57f.zip
Merge branch 'master' of github.com:Bcfg2/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Client/Frame.py')
-rw-r--r--src/lib/Bcfg2/Client/Frame.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index 51bc4aec7..b456738d0 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -299,9 +299,11 @@ class Frame:
bundles = filter(lambda b: b.tag != 'Bundle', bundles)
if self.setup['skipbundle']:
# warn if non-existent bundle given
- for bundle in self.setup['skipbundle']:
- if bundle not in all_bundle_names:
- self.logger.info("Warning: Bundle %s not found" % bundle)
+ if not self.setup['bundle_quick']:
+ for bundle in self.setup['skipbundle']:
+ 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)