From: Luis Chamberlain <mcgrof@kernel.org>
Date: Wed, 14 Feb 2024 17:42:08 +0000 (-0800)
Subject: common/config: fix CANON_DEVS=yes when file does not exist
X-Git-Tag: v2024.03.03~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb1f76a28453c59cfac01beb692ed97a4d88d420;p=xfstests-dev.git

common/config: fix CANON_DEVS=yes when file does not exist

CANON_DEVS=yes allows you to use symlinks for devices, so fstests
resolves them back to the real backing device. The iteration for
resolving the backing device works obviously if you have the file
present, but if one was not present there is a parsing error. Fix
this parsing error introduced by a0c36009103b8 ("fstests: add helper
to canonicalize devices used to enable persistent disks").

Fixes: a0c36009103b8 ("fstests: add helper to canonicalize devices used to enable persistent disks"
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/common/config b/common/config
index a3b15b96..2a1434bb 100644
--- a/common/config
+++ b/common/config
@@ -679,7 +679,7 @@ _canonicalize_devices()
 			if [ -L $i ]; then
 				NEW_SCRATCH_POOL="$NEW_SCRATCH_POOL $(readlink -e $i)"
 			else
-				NEW_SCRATCH_POOL="$NEW_SCRATCH_POOL $i)"
+				NEW_SCRATCH_POOL="$NEW_SCRATCH_POOL $i"
 			fi
 		done
 		SCRATCH_DEV_POOL="$NEW_SCRATCH_POOL"