[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 19216149387528c168ad158ee23bcf7af1400eaa
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Apr 19 07:39:54 2005 +0100

    Clarified made ignore PGP signatures

diff --git a/MissingH/Debian/ControlParser.hs b/MissingH/Debian/ControlParser.hs
index 41886b1..47ff15f 100644
--- a/MissingH/Debian/ControlParser.hs
+++ b/MissingH/Debian/ControlParser.hs
@@ -54,8 +54,24 @@ entry = do key <- many1 (noneOf ":\r\n")
            return (key, unlines ([val] ++ exts))
 
 {- | Main parser for the control file -}
-control = many entry
+control :: CharParser [(String, String)]
+control = do many0 header
+             retval <- many entry
+             return retval
 
+headerPGP = do string "-----BEGIN PGP"
+               manyTill (noneOf "\r\n") eol
+               return ()
+blankLine = do many0 (oneOf " \t")
+               eol
+               return ()
+headerHash = do string "Hash: "
+                manyTill (noneOf "\r\n") eol
+                return ()
+header = (try headerPGP) <|> (try blankLine) <|> (try headerHash)
+
+{- | Dependency parser. -}
+depPart :: CharParser (String, Maybe (String, String, [String]))
 depPart = do packagename <- many1 (noneOf " (")
              many (char ' ')
              version <- (do char '('

-- 
haskell-testpack