From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 31 Oct 2014 23:25:49 +0000 (-0700)
Subject: ceph.in: remove '--' from injectargs, if there, as well
X-Git-Tag: v0.88~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29d7786e030efde1a4aff134d9367865d9cc7d33;p=ceph.git

ceph.in: remove '--' from injectargs, if there, as well

Fixes: #9976
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 3c9484922b4..d133557669c 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -646,6 +646,8 @@ def main():
     # -- means "stop parsing args", but we don't want to see it either
     if '--' in childargs:
         childargs.remove('--')
+    if injectargs and '--' in injectargs:
+        injectargs.remove('--')
 
     # special deprecation warning for 'ceph <type> tell'
     # someday 'mds' will be here too