From 762e5ed8583b3523ad0aceb4a6703a6f61560653 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Sun, 14 Jun 2009 21:23:43 +0000
Subject: Implement -z (for Independent entries only, a la -b) (Resolves Ticket
 #616)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5281 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Client/Frame.py | 3 +++
 src/lib/Options.py      | 6 ++++--
 src/sbin/bcfg2          | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index 9be8a2343..735fb152c 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -217,6 +217,9 @@ class Frame:
                        if b.get('name') in self.setup['bundle']]
             self.whitelist = [e for e in self.whitelist if \
                               True in [e in b for b in bundles]]
+        elif self.setup['indep']:
+            bundles = [nb for nb in self.config.getchildren() if nb.tag != \
+                       'Bundle']
         else:
             bundles = self.config.getchildren()
 
diff --git a/src/lib/Options.py b/src/lib/Options.py
index a2d9d46ca..c916b96fe 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -252,8 +252,10 @@ CLIENT_CACHE = Option('store the configuration in a file',
                       default=False, cmd='-c', odesc="<cache path>")
 CLIENT_REMOVE = Option('force removal of additional configuration items',
                        default=False, cmd='-r', odesc="<entry type|all>")
-CLIENT_BUNDLE = Option('only configure the given bundle', default=[],
-                       cmd='-b', odesc='<bundle>', cook=colon_split)
+CLIENT_BUNDLE = Option('only configure the given bundle(s)', default=[],
+                       cmd='-b', odesc='<bundle:bundle>', cook=colon_split)
+CLIENT_INDEP = Option('only configure the given bundle(s)', default=False,
+                       cmd='-z')
 CLIENT_KEVLAR = Option('run in kevlar (bulletproof) mode', default=False,
                        cmd='-k', )
 CLIENT_DLIST = Option('run client in server decision list mode', default=False,
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 337bdb888..0e5db5161 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -49,6 +49,7 @@ class Client:
             'dryrun': Bcfg2.Options.CLIENT_DRYRUN,
             'paranoid': Bcfg2.Options.CLIENT_PARANOID,
             'bundle': Bcfg2.Options.CLIENT_BUNDLE,
+            'indep': Bcfg2.Options.CLIENT_INDEP,
             'file': Bcfg2.Options.CLIENT_FILE,
             'interactive': Bcfg2.Options.INTERACTIVE,
             'cache': Bcfg2.Options.CLIENT_CACHE,
-- 
cgit v1.2.3-1-g7c22