From 42baeeacb7618bcc269b2daa30766aff26f4f9f6 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Sat, 20 Jan 2007 15:37:51 +0000
Subject: Add temporary -e mode to display extra configuration entry details
 (Resolves Ticket #369)

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

diff --git a/man/bcfg2.1 b/man/bcfg2.1
index b81973705..e0be36bcf 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -3,7 +3,7 @@
 bcfg \- reconfigure machine based on settings in BCFG2
 .SH SYNOPSIS
 .B bcfg2
-.I [-d] [-v] [-p] [-c cache file] [-f config file] [-I] [-q] [-b bundle]
+.I [-d] [-v] [-p] [-c cache file] [-e] [-f config file] [-I] [-q] [-b bundle]
 [-r removal mode]
 .SH DESCRIPTION
 .PP
@@ -66,6 +66,11 @@ Cause bcfg2 to remove extra configuration elements it detects. Mode is one of al
 .RS
 Assert a profile for the current client.
 .RE
+.B "\-e" 
+.RS
+When in verbose mode, display extra entry information (temporary until
+verbosity rework)
+.RE
 .B "\-k" 
 .RS
 Run in bulletproof mode. This currently only effect behavior in the
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index 47813defb..f9d7a8ab0 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -222,6 +222,9 @@ class Frame:
         self.logger.info('Incorrect entries:\t%d' % self.states.values().count(False))
         self.logger.info('Total managed entries:\t%d' % len(self.states.values()))
         self.logger.info('Unmanaged entries:\t%d' % len(self.extra))
+        if phase == 'final' and self.setup['extra']:
+            self.logger.info(["%s:%s" % (entry.tag, entry.get('name')) \
+                              for entry in self.extra])
         self.logger.info("")
 
         if ((self.states.values().count(False) == 0) and not self.extra):
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 811be2847..0c45c5276 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -27,6 +27,8 @@ class Client:
             #                  env, cfpath, default, boolean)),
             'verbose':(('-v', False,"enable verbose output"),
                        False, False, False, True),
+            'extra':(('-e', False,"enable extra entry detailed output"),
+                       False, False, False, True),
             'quick':(('-q', False, "disable some checksum verification"),
                      False, False, False, True),
             'debug':(('-d', False, "enable debugging output"),
-- 
cgit v1.2.3-1-g7c22