Merge pull request #2733 from dachary/wip-9372-injectargs

cli: do not parse injectargs arguments twice

Reviewed-by:  Dan Mick <dan.mick@inktank.com>

diff --cc qa/workunits/cephtool/test.sh
Simple merge

diff --cc src/ceph.in
index 3cf0e244da613ac2b94a409dfe0b1f95bf6e51e4,4e8901b3015c817b58fbf333ab35bce6f27fb53a..3c9484922b43689e013804febb97f87e3f645777
--- 1/src/ceph.in
--- 2/src/ceph.in
+++ b/src/ceph.in
@@@ -620,10 -636,9 +636,9 @@@ def main()
          retargs = cluster_handle.conf_parse_argv(childargs)
      except rados.Error as e:
          print >> sys.stderr, 'Error initializing cluster client: {0}'.\
 -            format(e.__class__.__name__)
 +            format(repr(e))
          return 1
  
-     #tmp = childargs
      childargs = retargs
      if not childargs:
          childargs = []