X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-cabal%2FMain.hs;h=72a5010f805f6eac9fc5dd2b7cc7b46072c959fb;hb=6cec61d14a324285dbb8ce73d4c7215f1f8d6766;hp=0581f147cae5b0ad19a6678211c4c5466a802887;hpb=d41c40efd3137286617798e6be2cfdb6a80ae2a6;p=ghc-hetmet.git diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 0581f14..72a5010 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -393,13 +393,13 @@ generate config_args distdir directory escape = foldr (\c xs -> if c == '#' then '\\':'#':xs else c:xs) [] wrap = mapM wrap1 wrap1 s - | null s = die "Wrapping empty value" - | '\'' `elem` s = die "Single quote in value to be wrapped" + | null s = die ["Wrapping empty value"] + | '\'' `elem` s = die ["Single quote in value to be wrapped:", s] -- We want to be able to assume things like is the -- start of a value, so check there are no spaces in confusing -- positions - | head s == ' ' = die "Leading space in value to be wrapped" - | last s == ' ' = die "Trailing space in value to be wrapped" + | head s == ' ' = die ["Leading space in value to be wrapped:", s] + | last s == ' ' = die ["Trailing space in value to be wrapped:", s] | otherwise = return ("\'" ++ s ++ "\'") boolToYesNo True = "YES" boolToYesNo False = "NO"