Merge pull request #12540 from dmick/wip-18297

ceph.in: allow 'flags' to not be present in cmddescs
ceph · Dec 20, 2016 · e0903c9 · e0903c9
2 parents a84de42 + e72c801
commit e0903c9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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):