util-linux/backport-tests-lsfd-don-t-refer-on-the-line-follwoing-the-use.patch

42 lines
1.2 KiB
Diff
Raw Normal View History

From 5aa0c75c78dfb6a0c9851b348ba778149a4550a5 Mon Sep 17 00:00:00 2001
From: Masatake YAMATO <yamato@redhat.com>
Date: Thu, 11 Apr 2024 11:49:21 +0900
Subject: [PATCH] tests: (lsfd) don't refer "$?" on the line follwoing the use
of "local"
Suggested by ShellCheck.
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---
tests/ts/lsfd/lsfd-functions.bash | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash
index 533c25fae..9c2eb0785 100644
--- a/tests/ts/lsfd/lsfd-functions.bash
+++ b/tests/ts/lsfd/lsfd-functions.bash
@@ -40,13 +40,18 @@ function lsfd_compare_dev {
ts_check_prog "expr"
ts_check_prog "stat"
- local DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}")
+ local DEV
+ DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}")
echo 'DEV[RUN]:' $?
+
local MAJ=${DEV%:*}
local MIN=${DEV#*:}
local DEVNUM=$(ts_makedev "$MAJ" "$MIN")
- local STAT_DEVNUM=$(stat -c "%d" "$FILE")
+
+ local STAT_DEVNUM
+ STAT_DEVNUM=$(stat -c "%d" "$FILE")
echo 'STAT[RUN]:' $?
+
if [ "${DEVNUM}" == "${STAT_DEVNUM}" ]; then
echo 'DEVNUM[STR]:' 0
else
--
2.33.0