From 232593dea51c53f3251f9b41cd89e9dba20f0159 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 23 Mar 2016 14:35:14 +1100 Subject: [PATCH] filter.btrfs: new filter for property messages The error message in newer btrfs utilities contains name of the property, we want to filter it out so it matches golden output. There's an optional parameter with property name that is matched against the command output. Signed-off-by: David Sterba Reviewed-by: Filipe Manana Signed-off-by: Dave Chinner --- common/filter.btrfs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/filter.btrfs b/common/filter.btrfs index 9bb64792..38045439 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -68,5 +68,17 @@ _filter_btrfs_subvol_delete() } +# filter name of the property from the output, optionally verify against $1 +# recognized message(s): +# "object is not compatible with property: label" +_filter_btrfs_prop_error() +{ + if ! [ -z "$1" ]; then + sed -e "s/\(compatible with property\): $1/\1/" + else + sed -e "s/^\(.*compatible with property\).*/\1/" + fi +} + # make sure this script returns success /bin/true -- 2.39.5