From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 23 Oct 2014 19:32:37 +0000 (-0700)
Subject: Merge pull request #2733 from dachary/wip-9372-injectargs
X-Git-Tag: v0.88~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a12467a9c04842f4866bb665e3efddb0b38e2b4;p=ceph.git

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

cli: do not parse injectargs arguments twice

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

9a12467a9c04842f4866bb665e3efddb0b38e2b4
diff --cc src/ceph.in
index 3cf0e244da61,4e8901b3015c..3c9484922b43
--- a/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 = []