Hello community,
here is the log from the commit of package ghc-cabal-helper for
openSUSE:Factory checked in at 2016-01-28 17:23:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-cabal-helper (Old)
and /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cabal-helper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-cabal-helper/ghc-cabal-helper.changes
2016-01-22 01:08:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new/ghc-cabal-helper.changes
2016-01-28 17:24:31.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 22 07:55:32 UTC 2016 - mimi...@gmail.com
+
+- update to 0.6.3.1
+
+-------------------------------------------------------------------
Old:
----
cabal-helper-0.6.3.0.tar.gz
New:
----
cabal-helper-0.6.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-cabal-helper.spec ++++++
--- /var/tmp/diff_new_pack.BjaXtF/_old 2016-01-28 17:24:32.000000000 +0100
+++ /var/tmp/diff_new_pack.BjaXtF/_new 2016-01-28 17:24:32.000000000 +0100
@@ -19,7 +19,7 @@
%global pkg_name cabal-helper
%bcond_with tests
Name: ghc-cabal-helper
-Version: 0.6.3.0
+Version: 0.6.3.1
Release: 0
Summary: Simple interface to some of Cabal's configuration state used
by ghc-mod
License: AGPL-3.0+
++++++ cabal-helper-0.6.3.0.tar.gz -> cabal-helper-0.6.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/CabalHelper/Compile.hs
new/cabal-helper-0.6.3.1/CabalHelper/Compile.hs
--- old/cabal-helper-0.6.3.0/CabalHelper/Compile.hs 2015-11-25
23:10:09.000000000 +0100
+++ new/cabal-helper-0.6.3.1/CabalHelper/Compile.hs 2016-01-14
19:19:13.000000000 +0100
@@ -97,7 +97,8 @@
compileSandbox :: FilePath -> MaybeT IO (Either ExitCode FilePath)
compileSandbox chdir = do
sandbox <- MaybeT $ getSandboxPkgDb projdir (display buildPlatform) =<<
ghcVersion opts
- ver <- MaybeT $ find (== cabalVer) <$> listCabalVersions' opts (Just
sandbox)
+ ver <- MaybeT $ logSomeError opts "compileSandbox" $
+ find (== cabalVer) <$> listCabalVersions' opts (Just sandbox)
vLog opts $ logMsg ++ "sandbox package-db"
liftIO $ compileWithPkg chdir (Just sandbox) ver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/CabalHelper/GuessGhc.hs
new/cabal-helper-0.6.3.1/CabalHelper/GuessGhc.hs
--- old/cabal-helper-0.6.3.0/CabalHelper/GuessGhc.hs 2015-04-27
21:16:53.000000000 +0200
+++ new/cabal-helper-0.6.3.1/CabalHelper/GuessGhc.hs 2016-01-17
21:29:42.000000000 +0100
@@ -49,11 +49,11 @@
path = ghcPath
dir = takeDirectory path
versionSuffix = takeVersionSuffix (dropExeExtension path)
- guessNormal = dir </> toolname <.> exeExtension
+ guessNormal = dir </> toolname <.> exeExtension'
guessGhcVersioned = dir </> (toolname ++ "-ghc" ++ versionSuffix)
- <.> exeExtension
+ <.> exeExtension'
guessVersioned = dir </> (toolname ++ versionSuffix)
- <.> exeExtension
+ <.> exeExtension'
guesses | null versionSuffix = [guessNormal]
| otherwise = [guessGhcVersioned,
guessVersioned,
@@ -70,7 +70,7 @@
dropExeExtension :: FilePath -> FilePath
dropExeExtension filepath =
case splitExtension filepath of
- (filepath', extension) | extension == exeExtension -> filepath'
+ (filepath', extension) | extension == exeExtension' -> filepath'
| otherwise -> filepath
-- | @takeWhileEndLE p@ is equivalent to @reverse . takeWhile p . reverse@, but
@@ -81,3 +81,6 @@
go x (rest, done)
| not done && p x = (x:rest, False)
| otherwise = (rest, True)
+
+exeExtension' :: FilePath
+exeExtension' = Distribution.Simple.BuildPaths.exeExtension
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/CabalHelper/Log.hs
new/cabal-helper-0.6.3.1/CabalHelper/Log.hs
--- old/cabal-helper-0.6.3.0/CabalHelper/Log.hs 2015-08-21 06:28:15.000000000
+0200
+++ new/cabal-helper-0.6.3.1/CabalHelper/Log.hs 2016-01-14 19:19:13.000000000
+0100
@@ -2,6 +2,7 @@
import Control.Monad
import Control.Monad.IO.Class
+import Control.Exception as E
import Data.String
import System.IO
import Prelude
@@ -12,3 +13,9 @@
vLog Options { verbose = True } msg =
liftIO $ hPutStrLn stderr msg
vLog _ _ = return ()
+
+logSomeError :: Options -> String -> IO (Maybe a) -> IO (Maybe a)
+logSomeError opts label a = do
+ a `E.catch` \se@(SomeException _) -> do
+ vLog opts $ label ++ ": " ++ show se
+ return Nothing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/Distribution/Helper.hs
new/cabal-helper-0.6.3.1/Distribution/Helper.hs
--- old/cabal-helper-0.6.3.0/Distribution/Helper.hs 2016-01-10
22:00:45.000000000 +0100
+++ new/cabal-helper-0.6.3.1/Distribution/Helper.hs 2016-01-17
21:26:39.000000000 +0100
@@ -416,7 +416,7 @@
findLibexecExe "cabal-helper-wrapper" = do
libexecdir <- getLibexecDir
let exeName = "cabal-helper-wrapper"
- exe = libexecdir </> exeName <.> exeExtension
+ exe = libexecdir </> exeName <.> exeExtension'
exists <- doesFileExist exe
@@ -476,3 +476,6 @@
lookupEnv' :: String -> IO (Maybe String)
lookupEnv' k = lookup k <$> getEnvironment
+
+exeExtension' :: FilePath
+exeExtension' = Distribution.Simple.BuildPaths.exeExtension
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/Setup.hs
new/cabal-helper-0.6.3.1/Setup.hs
--- old/cabal-helper-0.6.3.0/Setup.hs 2015-04-27 21:16:53.000000000 +0200
+++ new/cabal-helper-0.6.3.1/Setup.hs 2016-01-14 19:17:15.000000000 +0100
@@ -6,6 +6,7 @@
import Distribution.Simple.Register
import Distribution.Simple.InstallDirs as ID
import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.Program
import Distribution.PackageDescription
import Control.Applicative
@@ -17,7 +18,8 @@
main :: IO ()
main = defaultMainWithHooks $ simpleUserHooks {
instHook = inst,
- copyHook = copy
+ copyHook = copy,
+ hookedPrograms = [ simpleProgram "cabal" ]
}
-- mostly copypasta from 'defaultInstallHook'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/cabal-helper.cabal
new/cabal-helper-0.6.3.1/cabal-helper.cabal
--- old/cabal-helper-0.6.3.0/cabal-helper.cabal 2016-01-10 22:00:59.000000000
+0100
+++ new/cabal-helper-0.6.3.1/cabal-helper.cabal 2016-01-18 20:53:46.000000000
+0100
@@ -1,5 +1,5 @@
name: cabal-helper
-version: 0.6.3.0
+version: 0.6.3.1
synopsis: Simple interface to some of Cabal's configuration state
used by ghc-mod
description:
@cabal-helper@ provides a library which wraps the internal use of
@@ -87,8 +87,17 @@
Default-Language: Haskell2010
Type: exitcode-stdio-1.0
Main-Is: Spec.hs
+ Other-Modules: CabalHelper.Common
+ CabalHelper.Compile
+ CabalHelper.Data
+ CabalHelper.Log
+ CabalHelper.Sandbox
+ CabalHelper.Types
+ Distribution.Helper
+ Paths_cabal_helper
Hs-Source-Dirs: tests, .
GHC-Options: -Wall
+ Build-Tools: cabal
Build-Depends: base >= 4.5 && < 5
, cabal-helper
, extra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-helper-0.6.3.0/tests/Spec.hs
new/cabal-helper-0.6.3.1/tests/Spec.hs
--- old/cabal-helper-0.6.3.0/tests/Spec.hs 2016-01-10 22:00:45.000000000
+0100
+++ new/cabal-helper-0.6.3.1/tests/Spec.hs 2016-01-17 22:21:02.000000000
+0100
@@ -55,6 +55,10 @@
"1.22.2.0"
, "1.22.3.0"
, "1.22.4.0"
+ , "1.22.5.0"
+ , "1.22.6.0"
+ ]),
+ ("8.0", [
])
]
