projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a4835b8
)
matchesPkg: match against the pkg Id (foo-1.0) not just the package name (foo)
author
Simon Marlow
<simonmar@microsoft.com>
Tue, 5 Feb 2008 09:04:29 +0000
(09:04 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Tue, 5 Feb 2008 09:04:29 +0000
(09:04 +0000)
Fixes the ghcpkg01 test.
utils/ghc-pkg/Main.hs
patch
|
blob
|
history
diff --git
a/utils/ghc-pkg/Main.hs
b/utils/ghc-pkg/Main.hs
index
936b309
..
866c9fe
100644
(file)
--- a/
utils/ghc-pkg/Main.hs
+++ b/
utils/ghc-pkg/Main.hs
@@
-624,7
+624,7
@@
pid `matches` pid'
matchesPkg :: PackageArg -> InstalledPackageInfo -> Bool
(Id pid) `matchesPkg` pkg = pid `matches` package pkg
-(Substring _ m) `matchesPkg` pkg = m (pkgName (package pkg))
+(Substring _ m) `matchesPkg` pkg = m (showPackageId (package pkg))
compPkgIdVer :: PackageIdentifier -> PackageIdentifier -> Ordering
compPkgIdVer p1 p2 = pkgVersion p1 `compare` pkgVersion p2