diff options
author | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
---|---|---|
committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
commit | 894299b01b6138c54a99fd41f166554d175d6106 (patch) | |
tree | 88e11cb8c49d3f933cf5f622a93dfa123922960f /src/sbin/bcfg2-info | |
parent | de0ae51b6dc635a3acd2491d4ca3fd021aa55873 (diff) | |
parent | f4da37aa0a360add3f5c40f37cd3cc010ef8788f (diff) | |
download | bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.gz bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.bz2 bcfg2-894299b01b6138c54a99fd41f166554d175d6106.zip |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'src/sbin/bcfg2-info')
-rwxr-xr-x | src/sbin/bcfg2-info | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 7277fa765..acb9e4f44 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -94,7 +94,7 @@ def load_interpreters(): best = "bpython" except ImportError: pass - + try: # whether ipython is actually better than bpython is # up for debate, but this is the behavior that existed @@ -454,7 +454,7 @@ Bcfg2 client itself.""") print(lxml.etree.tostring(pfile.XMLMatch(metadata), xml_declaration=False, pretty_print=True).decode('UTF-8')) - + def do_bundles(self, _): """ bundles - Print out group/bundle info """ data = [('Group', 'Bundles')] @@ -503,7 +503,6 @@ Bcfg2 client itself.""") pretty = True alist.remove('-p') if len(alist) != 1: - print 'alist=%s' % alist print(self._get_usage(self.do_probes)) return hostname = alist[0] @@ -736,7 +735,7 @@ Bcfg2 client itself.""") def _block(self): pass - + def build_usage(): |