Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ff6bf5d9c77e9c03a468e85bdcc339d293e55535

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

commit ff6bf5d9c77e9c03a468e85bdcc339d293e55535
Author: Duncan Coutts <[email protected]>
Date:   Tue Oct 16 00:46:06 2007 +0000

    Parse multiple repo urls listed in the .cabal/config correctly
    The url part cannot contain any chars, since then we allow spaces and ',' 
and
    thus break parsing of following repos.

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

 cabal-install/Hackage/Config.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs
index 88df38d..01e1f37 100644
--- a/cabal-install/Hackage/Config.hs
+++ b/cabal-install/Hackage/Config.hs
@@ -250,6 +250,6 @@ showRepo repo = repoName repo ++ ":" ++ repoURL repo
 parseRepo :: ReadP r Repo
 parseRepo = do name <- munch1 (\c -> isAlphaNum c || c `elem` "_-.")
                char ':'
-               url <- munch1 (const True)
+               url <- munch1 (\c -> isAlphaNum c || c `elem` 
"+-=._/*()@'$:;&!?")
                return $ Repo { repoName = name, repoURL = url }
 



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

Reply via email to