Skip to content

Commit 01a9f08

Browse files
authored
Merge pull request ceph#58373 from ceph/wip-tasks-ceph-mkfs-has-no-f
qa: ceph.py mkfs.ext4 has no -f
2 parents cc5533f + 4e54a90 commit 01a9f08

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

qa/tasks/ceph.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,9 @@ def cluster(ctx, config):
985985
try:
986986
remote.run(args=['yes', run.Raw('|')] + ['sudo'] + mkfs + [dev])
987987
except run.CommandFailedError:
988-
# Newer btfs-tools doesn't prompt for overwrite, use -f
988+
if fs != 'btrfs':
989+
raise
990+
# Newer btrfs-tools doesn't prompt for overwrite, use -f
989991
if '-f' not in mount_options:
990992
mkfs_options.append('-f')
991993
mkfs = ['mkfs.%s' % fs] + mkfs_options

0 commit comments

Comments
 (0)