Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/921530b477867edb5158e4ad5bbbdb5c7c531c97

>---------------------------------------------------------------

commit 921530b477867edb5158e4ad5bbbdb5c7c531c97
Author: Paolo Capriotti <[email protected]>
Date:   Tue May 15 10:32:58 2012 +0100

    Follow changes in Cabal.

>---------------------------------------------------------------

 .../Distribution/InstalledPackageInfo/Binary.hs    |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git 
a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs 
b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
index 242b7c0..7a254b7 100644
--- a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
+++ b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
@@ -136,7 +136,8 @@ instance Binary License where
   put PublicDomain         = do putWord8 5
   put AllRightsReserved    = do putWord8 6
   put OtherLicense         = do putWord8 7
-  put (UnknownLicense str) = do putWord8 8; put str
+  put (Apache v)           = do putWord8 8; put v
+  put (UnknownLicense str) = do putWord8 9; put str
 
   get = do
     n <- getWord8
@@ -149,6 +150,7 @@ instance Binary License where
       5 -> return PublicDomain
       6 -> return AllRightsReserved
       7 -> return OtherLicense
+      8 -> do v <- get; return (Apache v)
       _ -> do str <- get; return (UnknownLicense str)
 
 instance Binary Version where



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to