diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-29 10:26:28 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-29 22:23:17 +0200 |
| commit | 3d90c7fffc3c7e5fa0a02d829909c204fa0d6bfb (patch) | |
| tree | da67460df3cdba99966e908e14cc1920d549b5b1 | |
| parent | 834b82b0cd8dfb4867b7eb65e9608e96cf2ba08e (diff) | |
| download | lvm2-3d90c7fffc3c7e5fa0a02d829909c204fa0d6bfb.tar.gz | |
tests: get.sh declare and assign separately
Declare and assign separately to avoid masking return values.
Also comment-out currently unused orig variable.
| -rw-r--r-- | test/lib/get.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/test/lib/get.sh b/test/lib/get.sh index 0608bc943..88144c10c 100644 --- a/test/lib/get.sh +++ b/test/lib/get.sh @@ -28,32 +28,38 @@ trim_() { } pv_field() { - local r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + local r + r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") trim_ "$r" } vg_field() { - local r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + local r + r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") trim_ "$r" } lv_field() { - local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + local r + r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") trim_ "$r" } lv_first_seg_field() { - local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1) + local r + r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1) trim_ "$r" } lvh_field() { - local r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + local r + r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") trim_ "$r" } lva_field() { - local r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + local r + r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") trim_ "$r" } @@ -67,8 +73,10 @@ lv_field_lv_() { lv_tree_devices_() { local lv="$1/$2" - local type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1) - local orig=$(lv_field_lv_ "$lv" origin) + local type + type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1) + #local orig + #orig=$(lv_field_lv_ "$lv" origin) # FIXME: should we count in also origins ? #test -z "$orig" || lv_tree_devices_ $1 $orig case "$type" in @@ -76,7 +84,8 @@ lv_tree_devices_() { lv_devices "$lv" ;; mirror|raid*) - local log=$(lv_field_lv_ "$lv" mirror_log) + local log + log=$(lv_field_lv_ "$lv" mirror_log) test -z "$log" || lv_tree_devices_ "$1" "$log" for i in $(lv_devices "$lv") do lv_tree_devices_ "$1" "$i"; done |