summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Frame.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-07-20 13:47:46 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-07-20 13:47:46 -0400
commitb419ae3065554cf778ad00c44c33416bb8ea1850 (patch)
treee2a951ba8b689d7d2076eb09e97b74470645eaef /src/lib/Bcfg2/Client/Frame.py
parent15de42173b0ebab86f04a933b525b57a625f5fa7 (diff)
downloadbcfg2-b419ae3065554cf778ad00c44c33416bb8ea1850.tar.gz
bcfg2-b419ae3065554cf778ad00c44c33416bb8ea1850.tar.bz2
bcfg2-b419ae3065554cf778ad00c44c33416bb8ea1850.zip
made -B (skip bundle) mode work with -Q (bundle-quick mode)
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)