filter: btrfs-progs subvolume delete output changed

btrfs has started emitting new information from
cmd_subvol_delete(), so filter that out or it breaks btrfs/001:

    -Delete subvolume 'SCRATCH_MNT/snap'
    +Delete subvolume (no-commit): 'SCRATCH_MNT/snap'

(Spell "transaction" correctly while we're at it.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/filter.btrfs b/common/filter.btrfs
index ea047c55ea2e683b47515e4f52c2648f6ddf8779..9bb64792f14f2953bb680fd5cde60cfcd0ba293e 100644 (file)
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -57,13 +57,14 @@ _filter_btrfs_device_stats()
        sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
-_filter_transcation_commit_default() {
-       sed -e "/Transaction commit: none (default)/d"
+_filter_transaction_commit() {
+       sed -e "/Transaction commit: none (default)/d" | \
+       sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
 }
 
 _filter_btrfs_subvol_delete()
 {
-       _filter_scratch | _filter_transcation_commit_default
+       _filter_scratch | _filter_transaction_commit
 
 }