summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-06 16:35:13 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-06 16:35:18 -0400
commit01d68bf3237529f5cb6a9160b4328e797d01b0fe (patch)
treef55cd14a92e4f7a3c059a851c707ef93c7ffa821 /src/sbin
parent63167ca8054b58a7420cfc358c1decc77f06076f (diff)
downloadbcfg2-01d68bf3237529f5cb6a9160b4328e797d01b0fe.tar.gz
bcfg2-01d68bf3237529f5cb6a9160b4328e797d01b0fe.tar.bz2
bcfg2-01d68bf3237529f5cb6a9160b4328e797d01b0fe.zip
added -B (skip bundles) and -Z (skip independent) options
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg28
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 3cfdf38f6..2a7e5f585 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -43,8 +43,10 @@ class Client:
dryrun=Bcfg2.Options.CLIENT_DRYRUN,
paranoid=Bcfg2.Options.CLIENT_PARANOID,
bundle=Bcfg2.Options.CLIENT_BUNDLE,
+ skipbundle=Bcfg2.Options.CLIENT_SKIPBUNDLE,
bundle_quick=Bcfg2.Options.CLIENT_BUNDLEQUICK,
indep=Bcfg2.Options.CLIENT_INDEP,
+ skipindep=Bcfg2.Options.CLIENT_SKIPINDEP,
file=Bcfg2.Options.CLIENT_FILE,
interactive=Bcfg2.Options.INTERACTIVE,
cache=Bcfg2.Options.CLIENT_CACHE,
@@ -271,8 +273,10 @@ class Client:
if self.setup['bundle_quick']:
newconfig = Bcfg2.Client.XML.XML('<Configuration/>')
- [newconfig.append(bundle) for bundle in self.config.getchildren() if \
- bundle.tag == 'Bundle' and bundle.get('name') in self.setup['bundle']]
+ [newconfig.append(bundle)
+ for bundle in self.config.getchildren()
+ if (bundle.tag == 'Bundle' and
+ bundle.get('name') in self.setup['bundle'])]
self.config = newconfig
self.tools = Bcfg2.Client.Frame.Frame(self.config,