Wall police

AnsiColor.hs

@@ -9,7 +9,6 @@
 module AnsiColor
   where
 
--- import Portage.Config.Type
 import Data.List
 
 data Color  =  Black
@@ -23,20 +22,25 @@ data Color  =  Black
             |  Default
   deriving Enum
 
+esc :: [String] -> String
 esc []  =  ""
 esc xs  =  "\ESC[" ++ (concat . intersperse ";" $ xs) ++ "m"
 
+col :: Color -> Bool -> Color -> [String]
 col fg bf bg = show (fromEnum fg + 30) : bf' [show (fromEnum bg + 40)]
   where bf' | bf         =  ("01" :)
             | otherwise  =  id
 
+inColor :: Color -> Bool -> Color -> String -> String
 inColor c bf bg txt = esc (col c bf bg) ++ txt ++ esc ["00"]
 
+bold, italic, underline, inverse :: String -> String
 bold      = ansi "1" "22"
 italic    = ansi "3" "23"
 underline = ansi "4" "24"
 inverse   = ansi "7" "27"
 
+ansi :: String -> String -> String -> String
 ansi on off txt = esc [on] ++ txt ++ esc [off]
 
 {-

Bash.hs

@@ -1,6 +1,5 @@
 module Bash where
 
-import Control.Monad.Trans
 import Control.Monad.Error
 import System.Process
 import System.Directory
@@ -71,5 +70,5 @@ runBash command = do
 	length errors `seq` liftIO (hClose err)
 	exitCode <- liftIO $ waitForProcess pid
 	case exitCode of
-		ExitFailure err -> throwError $ BashError errors
-		ExitSuccess -> return result
+		ExitFailure _ -> throwError $ BashError errors
+		ExitSuccess   -> return result

BlingBling.hs

@@ -5,10 +5,11 @@ import System.IO
 -- what nobody needs but everyone wants...
 
 -- FIXME: do something more fun here
+forMbling :: [a] -> (a -> IO b) -> IO [b]
 forMbling lst f = do
-    init <- hGetBuffering stdout
+    origBuffering <- hGetBuffering stdout
     hSetBuffering stdout NoBuffering
     xs <- mapM (\x -> putStr "." >> f x) lst
     putStrLn ""
-    hSetBuffering stdout init
+    hSetBuffering stdout origBuffering
     return xs

Cabal2Ebuild.hs

@@ -27,17 +27,14 @@ module Cabal2Ebuild
         ,showEBuild) where
 
 import qualified Distribution.PackageDescription as Cabal
-                                                (PackageDescription(..),
-                                                 readPackageDescription)
+                                                (PackageDescription(..))
 import qualified Distribution.Package as Cabal  (PackageIdentifier(..))
 import qualified Distribution.Version as Cabal  (showVersion, Dependency(..),
                                                  VersionRange(..))
 import qualified Distribution.License as Cabal  (License(..))
 --import qualified Distribution.Compiler as Cabal (CompilerFlavor(..))
 
 import Data.Char          (toLower,isUpper)
-import Data.Maybe         (catMaybes)
-import Text.Regex
 
 data EBuild = EBuild {
     name :: String,
@@ -68,6 +65,7 @@ data Dependency = AnyVersionOf               Package
                 | DependEither Dependency Dependency   -- depend || depend
                 | DependIfUse  UseFlag    Dependency   -- use? ( depend )
 
+ebuildTemplate :: EBuild
 ebuildTemplate = EBuild {
     name = "foobar",
     version = "0.1",
@@ -105,6 +103,7 @@ cabal2ebuild pkg = ebuildTemplate {
   } where
         cabalPkgName = Cabal.pkgName (Cabal.package pkg)
 
+defaultDepGHC :: Dependency
 defaultDepGHC     = OrLaterVersionOf "6.6.1" "dev-lang/ghc"
 
 -- map the cabal license type to the gentoo license string format
@@ -117,6 +116,7 @@ convertLicense Cabal.PublicDomain = "public-domain"
 convertLicense Cabal.AllRightsReserved = ""
 convertLicense _                  = ""
 
+licenseComment :: Cabal.License -> String
 licenseComment Cabal.AllRightsReserved =
   "Note: packages without a license cannot be included in portage"
 licenseComment Cabal.OtherLicense =
@@ -127,15 +127,15 @@ convertDependencies :: [Cabal.Dependency] -> [Dependency]
 convertDependencies = concatMap convertDependency
 
 convertDependency :: Cabal.Dependency -> [Dependency]
-convertDependency (Cabal.Dependency name _)
-  | name `elem` coreLibs = []      -- no explicit dep on core libs
-convertDependency (Cabal.Dependency name versionRange)
+convertDependency (Cabal.Dependency pname _)
+  | pname `elem` coreLibs = []      -- no explicit dep on core libs
+convertDependency (Cabal.Dependency pname versionRange)
   = case versionRange of
       (Cabal.IntersectVersionRanges v1 v2) -> [convert v1, convert v2]
       v                                    -> [convert v]
 
   where
-    ebuildName = "dev-haskell/" ++ map toLower name
+    ebuildName = "dev-haskell/" ++ map toLower pname
 
     convert :: Cabal.VersionRange -> Dependency
     convert Cabal.AnyVersion = AnyVersionOf ebuildName
@@ -149,6 +149,7 @@ convertDependency (Cabal.Dependency name versionRange)
     convert (Cabal.UnionVersionRanges r1 r2)
       = DependEither (convert r1) (convert r2)
 
+coreLibs :: [String]
 coreLibs =
   ["array"
   ,"base"
@@ -200,32 +201,41 @@ showEBuild ebuild =
   ss "DEPEND=". quote' (sepBy "\n\t\t" $ map showDepend $ depend ebuild). nl.
   (case my_pn ebuild of
      Nothing -> id
-     Just pn -> nl. ss "S=". quote ("${WORKDIR}/${MY_P}"). nl)
+     Just _ -> nl. ss "S=". quote ("${WORKDIR}/${MY_P}"). nl)
   $ []
   where replaceVars = replaceCommonVars (name ebuild) (my_pn ebuild) (version ebuild)
 
-showDepend (AnyVersionOf               package) = package
-showDepend (ThisVersionOf      version package) = "~" ++ package ++ "-" ++ version
-showDepend (LaterVersionOf     version package) = ">" ++ package ++ "-" ++ version
-showDepend (EarlierVersionOf   version package) = "<" ++ package ++ "-" ++ version
-showDepend (OrLaterVersionOf   version package) = ">=" ++ package ++ "-" ++ version
-showDepend (OrEarlierVersionOf version package) = "<=" ++ package ++ "-" ++ version
-showDepend (DependEither       depend1 depend2) = showDepend depend1
-                                     ++ " || " ++ showDepend depend2
-showDepend (DependIfUse        useflag depend@(DependEither _ _)) 
-                                                = useflag ++ "? " ++ showDepend depend
-showDepend (DependIfUse        useflag depend)  = useflag ++ "? ( " ++ showDepend depend ++ " )"
+showDepend :: Dependency -> Package
+showDepend (AnyVersionOf         p) = p
+showDepend (ThisVersionOf      v p) = "~" ++ p ++ "-" ++ v
+showDepend (LaterVersionOf     v p) = ">" ++ p ++ "-" ++ v
+showDepend (EarlierVersionOf   v p) = "<" ++ p ++ "-" ++ v
+showDepend (OrLaterVersionOf   v p) = ">=" ++ p ++ "-" ++ v
+showDepend (OrEarlierVersionOf v p) = "<=" ++ p ++ "-" ++ v
+showDepend (DependEither       dep1 dep2) = showDepend dep1
+                                     ++ " || " ++ showDepend dep2
+showDepend (DependIfUse        useflag dep@(DependEither _ _)) 
+                                                = useflag ++ "? " ++ showDepend dep
+showDepend (DependIfUse        useflag dep)  = useflag ++ "? ( " ++ showDepend dep++ " )"
 
+ss :: String -> String -> String
 ss = showString
+
+sc :: Char -> String -> String
 sc = showChar
+
+nl :: String -> String
 nl = sc '\n'
 
+quote :: String -> String -> String
 quote str = sc '"'. ss str. sc '"'
+
+quote' :: (String -> String) -> String -> String
 quote' str = sc '"'. str. sc '"'
 
 sepBy :: String -> [String] -> ShowS
-sepBy s []     = id
-sepBy s [x]    = ss x
+sepBy _ []     = id
+sepBy _ [x]    = ss x
 sepBy s (x:xs) = ss x. ss s. sepBy s xs
 
 getRestIfPrefix ::
@@ -251,9 +261,9 @@ replaceMultiVars ::
 	String ->		-- ^ string to be searched
 	String 			-- ^ the result
 replaceMultiVars [] str = str
-replaceMultiVars whole@((name,cont):rest) str = case subStr cont str of
+replaceMultiVars whole@((pname,cont):rest) str = case subStr cont str of
 	Nothing -> replaceMultiVars rest str
-	Just (pre,post) -> (replaceMultiVars rest pre)++name++(replaceMultiVars whole post)
+	Just (pre,post) -> (replaceMultiVars rest pre)++pname++(replaceMultiVars whole post)
 
 replaceCommonVars ::
 	String ->	-- ^ PN

Cache.hs

@@ -12,8 +12,8 @@ import Version
 import Control.Arrow
 import Data.Char
 import Data.List
-import Network.URI
-import Network.HTTP
+import Network.URI (URI, uriPath)
+import Network.HTTP (Request(..), RequestMethod(GET), simpleHTTP, rspBody)
 import qualified Data.ByteString.Lazy as L
 import System.Time
 import System.FilePath

Config.hs

@@ -2,17 +2,11 @@ module Config where
 
 import Network.URI
 import System.Console.GetOpt
-import Control.Exception
 import Text.Regex
-import Distribution.Package
-
-import Error
-import MaybeRead
 
 data HackPortOptions
 	= OverlayPath String
         | PortagePath String
-	| Category String
 	| Server String
 	| TempDir String
 	| Verbosity String
@@ -49,6 +43,7 @@ data Verbosity
 	| Normal
 	| Silent
 
+packageRegex :: Regex
 packageRegex = mkRegex "^(.*?)-([0-9].*)$"
 
 defaultConfig :: Config
@@ -91,17 +86,17 @@ parseConfig opts = let
 		"diff":"additions":[] -> Right (DiffTree ShowAdditions)
 		"diff":"newer":[] -> Right (DiffTree ShowNewer)
 		"diff":"common":[] -> Right (DiffTree ShowCommon)
-		"diff":arg:[] -> Left ("Unknown argument to 'diff': Use all,missing,additions,newer or common.\n")
-		"diff":arg1:args -> Left ("'diff' takes one argument("++show ((length args)+1)++" given).\n")
+		"diff":arg:[] -> Left ("Unknown argument to diff: '" ++ arg ++ "'. Use all,missing,additions,newer or common.\n")
+		"diff":_:xs -> Left ("'diff' takes one argument("++show ((length xs)+1)++" given).\n")
 		"update":[] -> Right Update
 		"update":rest -> Left ("'update' takes zero arguments("++show (length rest)++" given).\n")
 		"status":[] -> Right Status
-		"status":args -> Left ("'status' doesn't take any arguments. ("++show ((length args)+1)++" given).\n")
+		"status":xs-> Left ("'status' doesn't take any arguments. ("++show ((length xs)+1)++" given).\n")
 		[] -> Right ShowHelp
 		_ -> Left "Unknown opertation mode\n"
 	in case mode of
 		Left err -> Left err
-		Right mod -> Right (popts,mod)
+		Right m -> Right (popts,m)
 
 hackageUsage :: IO ()
 hackageUsage = putStr $ flip usageInfo hackageOptions $ unlines

Diff.hs

@@ -2,16 +2,14 @@ module Diff
     ( diffAction
     ) where
 
-import Data.Set as Set (Set)
-import qualified Data.Set as Set
 import qualified Data.Map as Map
 
 import Control.Monad.Trans
 import Data.Char
 
 import Action
 import Cache
-import Config
+import Config (DiffMode(..))
 import P2
 import Portage
 import Version

Error.hs

@@ -2,9 +2,7 @@
 module Error where
 
 import Data.Typeable
-import Distribution.Package
-import Control.Monad.Error
-import Control.Exception
+import Control.Monad.Error (Error)
 
 data HackPortError
 	= ArgumentError String
@@ -52,5 +50,6 @@ hackPortShowError err = case err of
 	MultipleOverlays overlays -> "You have the following overlays available: '"++unwords overlays++"'. Please choose one by using '-p path-to-overlay'"
 	NoOverlay -> "You don't have PORTDIR_OVERLAY set in '/etc/make.conf'. Please set it or use '-p path-to-overlay'"
 	UnknownVerbosityLevel str -> "The verbosity level '"++str++"' is invalid. Please use debug,normal or silent"
+        InvalidServer srv -> "Invalid server address, could not parse: " ++ srv
 	--WrongCacheVersion -> "The version of the cache is too old. Please update the cache using 'hackport update'"
 	--InvalidCache -> "Could not read the cache. Please ensure that it's up to date using 'hackport update'"

GenerateEbuild.hs

@@ -2,16 +2,10 @@ module GenerateEbuild where
 
 import Action
 import Cabal2Ebuild
---import Fetch
---import TarUtils
 import Config
-import Error
 
 import Prelude hiding (catch)
-import Control.Monad.Trans
 import Control.Monad.Error
-import Control.Exception
-import Distribution.PackageDescription
 import Distribution.Package
 import Data.Version (showVersion)
 import Network.URI

Index.hs

@@ -22,7 +22,7 @@ readIndex str = do
     case splitDirectories (tarFileName (entryHeader entr)) of
         [".",pkgname,vers,file] -> do
             let descr = case parsePackageDescription (unpack (entryData entr)) of
-                    ParseOk _ descr -> descr
+                    ParseOk _ pkg_desc -> pkg_desc
                     _  -> error $ "Couldn't read cabal file "++show file
             return (pkgname,vers,descr)
         _ -> fail "doesn't look like the proper path"

Main.hs

@@ -7,12 +7,12 @@ import Data.List
 import Data.Version
 import Distribution.Package
 import Distribution.PackageDescription
+        (packageDescription, finalizePackageDescription, package)
 import System.IO
 import System.Info (os, arch)
 import qualified Data.Map as Map
 import Text.ParserCombinators.Parsec
 
-
 import Action
 import qualified Cabal2Ebuild as E
 import Cache
@@ -25,7 +25,6 @@ import Status
 import Package
 import Portage
 import P2
-import Utils
 
 list :: String -> HPAction ()
 list name = do
@@ -68,6 +67,8 @@ merge pstr = do
                 case ebuilds of
                     [] -> throwError (PackageNotFound (pname ++ '-':show v))
                     [e] -> return e
+                    _ -> fail "the impossible happened"
+        _ -> fail "the impossible happened"
     category <- do
         case m_category of
             Just cat -> return cat
@@ -106,7 +107,7 @@ hpmain = do
         ShowHelp -> liftIO hackageUsage
         List pkg -> list pkg
         Merge pkg -> merge pkg
-        DiffTree mode -> diffAction mode
+        DiffTree dtmode -> diffAction dtmode
         Update -> updateCache
         Status -> status
 

P2.hs

@@ -15,7 +15,6 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Maybe
 import qualified Data.List as List
-import Data.Monoid
 
 import System.Directory
 import System.IO
@@ -24,7 +23,6 @@ import System.FilePath
 import Text.Regex
 
 import Version
-import Utils
 
 type Portage = PortageMap [Ebuild]
 type PortageMap a = Map Package a