From e72c80197b8f69a469dbb9cf64941500174dd152 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 16 Dec 2016 14:58:46 -0800 Subject: [PATCH] ceph.in: allow 'flags' to not be present in cmddescs the 'flags' key in the command description dict may not be present on older monitors. Check for existence before using it. Introduced in 61d63433dfdcc08ecc21ba4f645794da5e01823c Fixes: http://tracker.ceph.com/issues/18297 Signed-off-by: Dan Mick --- src/ceph.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ceph.in b/src/ceph.in index a32d42c8e9c..c2da5c509d0 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -342,7 +342,9 @@ def format_help(cmddict, partial=None): if not cmd['help']: continue - if cmd['flags'] is not None and ((cmd['flags'] & (FLAG_OBSOLETE | FLAG_DEPRECATED)) != 0): + flags = cmd.get('flags') + if (flags is not None and + (flags & (FLAG_OBSOLETE | FLAG_DEPRECATED)) != 0): continue concise = concise_sig(cmd['sig']) if partial and not concise.startswith(partial): -- 2.39.5