From: Kefu Chai <kchai@redhat.com>
Date: Sat, 26 Dec 2020 12:57:30 +0000 (+0800)
Subject: pybind/mgr: do not check for kwargs if already collecting kwargs
X-Git-Tag: v16.1.0~20^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01190fff1df9a758ead0ba899e96f0b721d37ded;p=ceph.git

pybind/mgr: do not check for kwargs if already collecting kwargs

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 6b5b0ba3479e..b207a3c676a3 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -319,10 +319,15 @@ class CLICommand(object):
         return self.func
 
     def _get_arg_value(self, kwargs_switch, key, val):
-        if isinstance(val, str) and '=' in val:
-            k, v = val.split('=', 1)
-            if self._is_arg_key(k):
-                kwargs_switch = True
+        def start_kwargs():
+            if isinstance(val, str) and '=' in val:
+                k, v = val.split('=', 1)
+                if self._is_arg_key(k):
+                    return True
+            else:
+                return False
+        if not kwargs_switch:
+            kwargs_switch = start_kwargs()
 
         if kwargs_switch:
             k, v = val.split('=', 1)