Hello community,
here is the log from the commit of package ghc-conduit-extra for
openSUSE:Factory checked in at 2016-11-03 11:13:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-conduit-extra (Old)
and /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-conduit-extra"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-conduit-extra/ghc-conduit-extra.changes
2016-07-21 08:06:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-conduit-extra.new/ghc-conduit-extra.changes
2016-11-03 11:13:50.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Sep 26 06:52:26 UTC 2016 - psim...@suse.com
+
+- Update to version 1.1.13.3 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
conduit-extra-1.1.13.2.tar.gz
New:
----
conduit-extra-1.1.13.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-conduit-extra.spec ++++++
--- /var/tmp/diff_new_pack.4H8B6n/_old 2016-11-03 11:13:52.000000000 +0100
+++ /var/tmp/diff_new_pack.4H8B6n/_new 2016-11-03 11:13:52.000000000 +0100
@@ -19,15 +19,14 @@
%global pkg_name conduit-extra
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.1.13.2
+Version: 1.1.13.3
Release: 0
Summary: Batteries included conduit: adapters for common libraries
License: MIT
-Group: System/Libraries
+Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-async-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-blaze-builder-devel
@@ -53,7 +52,6 @@
BuildRequires: ghc-bytestring-builder-devel
BuildRequires: ghc-hspec-devel
%endif
-# End cabal-rpm deps
%description
The conduit package itself maintains relative small dependencies. The purpose
@@ -76,20 +74,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++++++ conduit-extra-1.1.13.2.tar.gz -> conduit-extra-1.1.13.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/ChangeLog.md
new/conduit-extra-1.1.13.3/ChangeLog.md
--- old/conduit-extra-1.1.13.2/ChangeLog.md 2016-07-04 08:32:33.000000000
+0200
+++ new/conduit-extra-1.1.13.3/ChangeLog.md 2016-09-19 15:27:12.000000000
+0200
@@ -1,3 +1,8 @@
+## 1.1.13.3
+
+* `withCheckedProcessCleanup` properly closes opened `Handle`s
+ [#280](https://github.com/snoyberg/conduit/issues/280)
+
## 1.1.13.2
* Fix alignment issues on non-X86 archs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/Data/Conduit/Process.hs
new/conduit-extra-1.1.13.3/Data/Conduit/Process.hs
--- old/conduit-extra-1.1.13.2/Data/Conduit/Process.hs 2016-07-04
08:32:33.000000000 +0200
+++ new/conduit-extra-1.1.13.3/Data/Conduit/Process.hs 2016-09-19
15:27:12.000000000 +0200
@@ -31,7 +31,7 @@
import Data.Conduit.Binary (sourceHandle, sinkHandle)
import Data.ByteString (ByteString)
import Control.Concurrent.Async (runConcurrently, Concurrently(..))
-import Control.Monad.Catch (MonadMask, onException, throwM, finally)
+import Control.Monad.Catch (MonadMask, onException, throwM, finally, bracket)
#if (__GLASGOW_HASKELL__ < 710)
import Control.Applicative ((<$>), (<*>))
#endif
@@ -140,13 +140,15 @@
=> CreateProcess
-> (stdin -> stdout -> stderr -> m b)
-> m b
-withCheckedProcessCleanup cp f = do
- (x, y, z, sph) <- streamingProcess cp
- res <- f x y z `onException` liftIO (terminateStreamingProcess sph)
- ec <- waitForStreamingProcess sph
- if ec == ExitSuccess
- then return res
- else throwM $ ProcessExitedUnsuccessfully cp ec
+withCheckedProcessCleanup cp f = bracket
+ (streamingProcess cp)
+ (\(_, _, _, sph) -> closeStreamingProcessHandle sph)
+ $ \(x, y, z, sph) -> do
+ res <- f x y z `onException` liftIO (terminateStreamingProcess sph)
+ ec <- waitForStreamingProcess sph
+ if ec == ExitSuccess
+ then return res
+ else throwM $ ProcessExitedUnsuccessfully cp ec
terminateStreamingProcess :: StreamingProcessHandle -> IO ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/conduit-extra-1.1.13.2/conduit-extra.cabal
new/conduit-extra-1.1.13.3/conduit-extra.cabal
--- old/conduit-extra-1.1.13.2/conduit-extra.cabal 2016-07-04
08:32:33.000000000 +0200
+++ new/conduit-extra-1.1.13.3/conduit-extra.cabal 2016-09-19
15:27:12.000000000 +0200
@@ -1,5 +1,5 @@
Name: conduit-extra
-Version: 1.1.13.2
+Version: 1.1.13.3
Synopsis: Batteries included conduit: adapters for common libraries.
Description:
The conduit package itself maintains relative small dependencies. The
purpose of this package is to collect commonly used utility functions wrapping
other library dependencies, without depending on heavier-weight dependencies.
The basic idea is that this package should only depend on haskell-platform
packages and conduit.
@@ -59,7 +59,7 @@
, process
, resourcet >= 1.1
, stm
- , streaming-commons >= 0.1.11
+ , streaming-commons >= 0.1.16
ghc-options: -Wall
