From 85c2ef54a48b12bb7bef0e841e4948fae13d7242 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 15 Jan 2007 12:44:41 +0000 Subject: [PATCH] Fix ghc-pkg now showError has been removed --- utils/ghc-pkg/Main.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 896fd7c..a54101c 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -18,7 +18,7 @@ module Main (main) where import Version ( version, targetOS, targetARCH ) import Distribution.InstalledPackageInfo import Distribution.Compat.ReadP -import Distribution.ParseUtils ( showError ) +import Distribution.ParseUtils import Distribution.Package import Distribution.Version import Compat.Directory ( getAppUserDataDirectory, createDirectoryIfMissing ) @@ -429,7 +429,9 @@ parsePackageInfo parsePackageInfo str defines = case parseInstalledPackageInfo str of ParseOk _warns ok -> return ok - ParseFailed err -> die (showError err) + ParseFailed err -> case locatedErrorMsg err of + (Nothing, s) -> die s + (Just l, s) -> die (show l ++ ": " ++ s) -- ----------------------------------------------------------------------------- -- Exposing, Hiding, Unregistering are all similar -- 1.7.10.4