diff --git a/cabal-install/src/Distribution/Client/Init/Types.hs b/cabal-install/src/Distribution/Client/Init/Types.hs index 5c10b2fde42..ee7d7cbe0c3 100644 --- a/cabal-install/src/Distribution/Client/Init/Types.hs +++ b/cabal-install/src/Distribution/Client/Init/Types.hs @@ -458,10 +458,10 @@ instance Exception BreakException data Severity = Info | Warning | Error deriving (Eq) displaySeverity :: Severity -> String -displaySeverity severity - | severity == Info = "Info" - | severity == Warning = "Warn" - | severity == Error = "Err" +displaySeverity severity = case severity of + Info -> "Info" + Warning -> "Warn" + Error -> "Err" -- | Convenience alias for the literate haskell flag type IsLiterate = Bool diff --git a/cabal-install/tests/IntegrationTests2/config/default-config b/cabal-install/tests/IntegrationTests2/config/default-config index 7ea0ac65d56..788e496afa3 100644 --- a/cabal-install/tests/IntegrationTests2/config/default-config +++ b/cabal-install/tests/IntegrationTests2/config/default-config @@ -25,8 +25,8 @@ repository hackage.haskell.org -- store-dir: -- active-repositories: -- local-no-index-repo: -remote-repo-cache: /home/colton/.cabal/packages --- logs-dir: /home/colton/.cabal/logs +remote-repo-cache: /home/alex/.cabal/packages +-- logs-dir: /home/alex/.cabal/logs -- default-user-config: -- verbose: 1 -- compiler: ghc @@ -104,12 +104,13 @@ remote-repo-cache: /home/colton/.cabal/packages -- index-state: -- root-cmd: -- symlink-bindir: -build-summary: /home/colton/.cabal/logs/build.log +build-summary: /home/alex/.cabal/logs/build.log -- build-log: remote-build-reporting: none -- report-planning-failure: False -- per-component: True -- run-tests: +-- semaphore: False jobs: $ncpus -- keep-going: False -- offline: False @@ -117,11 +118,12 @@ jobs: $ncpus -- package-env: -- overwrite-policy: -- install-method: -installdir: /home/colton/.cabal/bin +installdir: /home/alex/.cabal/bin -- token: -- username: -- password: -- password-command: +-- multi-repl: -- builddir: haddock @@ -161,7 +163,7 @@ init -- source-dir: src install-dirs user - -- prefix: /home/colton/.cabal + -- prefix: /home/alex/.cabal -- bindir: $prefix/bin -- libdir: $prefix/lib -- libsubdir: $abi/$libname