diff options
author | Raul Cuza <raulcuza@gmail.com> | 2011-07-07 09:50:57 -0400 |
---|---|---|
committer | Raul Cuza <raulcuza@gmail.com> | 2011-07-07 09:50:57 -0400 |
commit | 32ed613f486bc379d9c5edbab79c181eb87d1ee6 (patch) | |
tree | 3964a3a8680f85ceba7e706e73db55ea2971381d | |
parent | e1e7067e2c0aed35b0e5cc75d421dd7e399219c3 (diff) | |
parent | 78fdb58c5fd0238ad331adca1707ce39ed50469b (diff) | |
download | bcfg2-32ed613f486bc379d9c5edbab79c181eb87d1ee6.tar.gz bcfg2-32ed613f486bc379d9c5edbab79c181eb87d1ee6.tar.bz2 bcfg2-32ed613f486bc379d9c5edbab79c181eb87d1ee6.zip |
Merge remote-tracking branch 'upstream/master'
-rw-r--r-- | man/bcfg2-admin.8 | 6 | ||||
-rw-r--r-- | src/lib/Server/Admin/Viz.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/man/bcfg2-admin.8 b/man/bcfg2-admin.8 index 4f6528e0e..6607344d8 100644 --- a/man/bcfg2-admin.8 +++ b/man/bcfg2-admin.8 @@ -67,7 +67,7 @@ Interact with the Snapshots database. .RS Remove unused files from repository. .RE -.B viz [-H] [-b] [-k] [-o png-file] [-r] +.B viz [-H] [-b] [-k] [-o png-file] .RS Create a graphviz diagram of client, group and bundle information. .RE @@ -208,10 +208,6 @@ Include bundles in diagram. .RS Write to outfile file instead of stdout. .RE -.B \-r -.RS -Produce raw graphviz output. -.RE .B \-k .RS Add a shape/color key. diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Server/Admin/Viz.py index bd7c6dd05..3ab54e543 100644 --- a/src/lib/Server/Admin/Viz.py +++ b/src/lib/Server/Admin/Viz.py @@ -10,7 +10,7 @@ class Viz(Bcfg2.Server.Admin.MetadataCore): __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin viz [--includehosts] " "[--includebundles] [--includekey] " "[--only-client clientname] " - "[-o output.png] [--raw]\n") + "[-o output.<ext>]\n") __usage__ = ("bcfg2-admin viz [options]\n\n" " %-32s%s\n" " %-32s%s\n" @@ -56,8 +56,6 @@ class Viz(Bcfg2.Server.Admin.MetadataCore): print(self.__longhelp__) raise SystemExit(1) - #FIXME: is this for --raw? - #rset = False hset = False bset = False kset = False |