ceph.in: allow 'flags' to not be present in cmddescs #12540
Conversation
the 'flags' key in the command description dict may not be present on older monitors. Check for existence before using it. Introduced in 61d6343 Fixes: http://tracker.ceph.com/issues/18297 Signed-off-by: Dan Mick <dan.mick@redhat.com>
| @@ -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 | |||
There was a problem hiding this comment.
this explicit check for flags is not None is clearly fixing the issue, but this is extremely hard to parse due to the uncommon usage of Python's bitwise operators.
Is it really that necessary to use logical bitwise operators to check if a flag is obsolete or deprecated?
There was a problem hiding this comment.
I don't think it can be changed without chagning hte json schema...
There was a problem hiding this comment.
I mean, it is not necessary to use &, |, or << here. Regular Python operators would do just fine.
There was a problem hiding this comment.
just saw this. It seems like idiomatic usage to me, but then I'm a C programmer first
|
I was on PTO when you requested this review. It looks good. Thanks for fixing this @dmick. |
the 'flags' key in the command description dict may not be
present on older monitors. Check for existence before
using it.
Introduced in 61d6343
Fixes: http://tracker.ceph.com/issues/18297
Signed-off-by: Dan Mick dan.mick@redhat.com