-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cephadm: line break after binary operator (W504)
Signed-off-by: Michael Fritch <[email protected]>
- Loading branch information
Showing
2 changed files
with
5 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5224,17 +5224,17 @@ def command_rm_cluster(ctx): | |
verbosity=CallVerbosity.DEBUG) | ||
|
||
# rm units | ||
call_throws(ctx, ['rm', '-f', ctx.unit_dir + | ||
call_throws(ctx, ['rm', '-f', ctx.unit_dir + # noqa: W504 | ||
'/ceph-%[email protected]' % ctx.fsid]) | ||
call_throws(ctx, ['rm', '-f', ctx.unit_dir + | ||
call_throws(ctx, ['rm', '-f', ctx.unit_dir + # noqa: W504 | ||
'/ceph-%s.target' % ctx.fsid]) | ||
call_throws(ctx, ['rm', '-rf', | ||
ctx.unit_dir + '/ceph-%s.target.wants' % ctx.fsid]) | ||
# rm data | ||
call_throws(ctx, ['rm', '-rf', ctx.data_dir + '/' + ctx.fsid]) | ||
# rm logs | ||
call_throws(ctx, ['rm', '-rf', ctx.log_dir + '/' + ctx.fsid]) | ||
call_throws(ctx, ['rm', '-rf', ctx.log_dir + | ||
call_throws(ctx, ['rm', '-rf', ctx.log_dir + # noqa: W504 | ||
'/*.wants/ceph-%s@*' % ctx.fsid]) | ||
# rm logrotate config | ||
call_throws(ctx, ['rm', '-f', ctx.logrotate_dir + '/ceph-%s' % ctx.fsid]) | ||
|
@@ -6409,9 +6409,8 @@ class HostFacts(): | |
"""Return the attributes of this HostFacts object as json""" | ||
data = { | ||
k: getattr(self, k) for k in dir(self) | ||
if not k.startswith('_') and | ||
isinstance(getattr(self, k), | ||
(float, int, str, list, dict, tuple)) | ||
if not k.startswith('_') | ||
and isinstance(getattr(self, k), (float, int, str, list, dict, tuple)) | ||
} | ||
return json.dumps(data, indent=2, sort_keys=True) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,6 @@ max-line-length = 100 | |
ignore = | ||
E501, | ||
W503, | ||
W504, | ||
exclude = | ||
.tox, | ||
.vagrant, | ||
|