diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-26 20:27:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-26 20:27:49 +0000 |
| commit | a11bb49b97eaba892730baf1565e922715dbc07f (patch) | |
| tree | b9ebdf37ef6329cd8c836aec5a2aca78b55ba70a /utils | |
| parent | abd113f06ebf3ac29f852e80c5a8c0060f979202 (diff) | |
| download | haskell-a11bb49b97eaba892730baf1565e922715dbc07f.tar.gz | |
Follow Cabal changes
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index d8b8639380..91c8ade957 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -324,7 +324,8 @@ parseGlobPackageId :: ReadP r PackageIdentifier parseGlobPackageId = parse +++ - (do n <- parsePackageName; string "-*" + (do n <- parse + string "-*" return (PackageIdentifier{ pkgName = n, pkgVersion = globVersion })) -- globVersion means "all versions" @@ -573,7 +574,7 @@ listPackages flags mPackageName mModuleName = do where doc = text (display (package p)) show_simple db_stack = do - let showPkg = if FlagNamesOnly `elem` flags then pkgName + let showPkg = if FlagNamesOnly `elem` flags then display . pkgName else display pkgs = map showPkg $ sortBy compPkgIdVer $ map package (concatMap snd db_stack) |