Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7d270a91af18ae52b713f2ffdb31b3aae9683247 >--------------------------------------------------------------- commit 7d270a91af18ae52b713f2ffdb31b3aae9683247 Author: Duncan Coutts <[email protected]> Date: Tue Aug 26 23:26:06 2008 +0000 Use mplus not mappend for combining tar filename checks mappend would join the error messages in the case that both checks failed. Also the monoid instance was new in base 3. >--------------------------------------------------------------- cabal-install/Distribution/Client/Tar.hs | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cabal-install/Distribution/Client/Tar.hs b/cabal-install/Distribution/Client/Tar.hs index f2b08d4..3eb8503 100644 --- a/cabal-install/Distribution/Client/Tar.hs +++ b/cabal-install/Distribution/Client/Tar.hs @@ -57,11 +57,11 @@ module Distribution.Client.Tar ( checkEntryNames ) where -import Data.Char (ord) -import Data.Int (Int64) -import Data.List (foldl') -import Data.Monoid (Monoid(..)) -import Numeric (readOct, showOct) +import Data.Char (ord) +import Data.Int (Int64) +import Data.List (foldl') +import Control.Monad (MonadPlus(mplus)) +import Numeric (readOct, showOct) import qualified Data.ByteString.Lazy as BS import qualified Data.ByteString.Lazy.Char8 as BS.Char8 @@ -409,8 +409,8 @@ checkEntryNames = checkEntryName :: Entry -> Maybe String checkEntryName entry = case fileType entry of - HardLink -> check (fileName entry) `mappend` check (linkTarget entry) - SymbolicLink -> check (fileName entry) `mappend` check (linkTarget entry) + HardLink -> check (fileName entry) `mplus` check (linkTarget entry) + SymbolicLink -> check (fileName entry) `mplus` check (linkTarget entry) _ -> check (fileName entry) where _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
