X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fghc-pkg%2FMain.hs;h=e57a383b5466d7c3e2235c70d05f1cb5cc81e3a0;hb=5a5d36cdba3f3154bd14092e06c466d50300c2b7;hp=b455d685fdb3c470552bbb92d823b3476c1782f0;hpb=4a4b87decd8a2c989d0d68a65c1ae0d1e115ecf5;p=ghc-hetmet.git diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs index b455d68..e57a383 100644 --- a/ghc/utils/ghc-pkg/Main.hs +++ b/ghc/utils/ghc-pkg/Main.hs @@ -9,7 +9,6 @@ -- TODO: -- - validate modules --- - expose/hide -- - expanding of variables in new-style package conf -- - version manipulation (checking whether old version exists, -- hiding old version?) @@ -19,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 ( showError, ParseResult(..) ) import Distribution.Package import Distribution.Version import Compat.Directory ( getAppUserDataDirectory, createDirectoryIfMissing ) @@ -338,8 +337,8 @@ parsePackageInfo -> IO InstalledPackageInfo parsePackageInfo str defines force = case parseInstalledPackageInfo str of - Right ok -> return ok - Left err -> die (showError err) + ParseOk ok -> return ok + ParseFailed err -> die (showError err) -- Used for converting versionless package names to new -- PackageIdentifiers. "Version [] []" is special: it means "no