From 2db8167ddbfa080b44509d4532d7d34887cdc64a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jun 2021 13:28:25 -0400 Subject: merge from git-annex Fixes 2 bugs, one a data loss bug. It is possible to get those fixes without merging all the other changes, if a backport is wanted. --- Build/TestConfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Build') diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs index 2f7213f..988db58 100644 --- a/Build/TestConfig.hs +++ b/Build/TestConfig.hs @@ -97,7 +97,7 @@ searchCmd success failure cmdsparams = search cmdsparams - the command. -} findCmdPath :: ConfigKey -> String -> Test findCmdPath k command = do - ifM (inPath command) + ifM (inSearchPath command) ( return $ Config k $ MaybeStringConfig $ Just command , do r <- getM find ["/usr/sbin", "/sbin", "/usr/local/sbin"] -- cgit v1.2.3