zip-archive 0.4.2.1 → 0.4.2.2

raw patch · 3 files changed

+10/−3 lines, 3 files

Files

changelog +5/−0
tests/test-zip-archive.hs +4/−2
zip-archive.cabal +1/−1

changelog view

@@ -1,3 +1,8 @@+zip-archive 0.4.2.2++  * Use `command -v` before trying `which` in the test suite (#62).+    `command` is a bash builtin, but for busybox we'll need `which`.+ zip-archive 0.4.2.1    * Fix Windows build regression (#61).

tests/test-zip-archive.hs view

@@ -1,11 +1,12 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-# LANGUAGE CPP #-}+{-# LANGUAGE ScopedTypeVariables #-} -- Test suite for Codec.Archive.Zip -- runghc Test.hs  import Codec.Archive.Zip import Control.Monad (unless)-import Control.Exception (try)+import Control.Exception (try, catch, SomeException) import System.Directory hiding (isSymbolicLink) import Test.HUnit.Base import Test.HUnit.Text@@ -51,7 +52,8 @@ main :: IO Counts main = withTempDirectory "." "test-zip-archive." $ \tmpDir -> do #ifndef _WINDOWS-  ec <- rawSystem "which" ["unzip"]+  ec <- catch (rawSystem "command" ["-v", "unzip"])+         (\(_ :: SomeException) -> rawSystem "which" ["unzip"])   let unzipInPath = ec == ExitSuccess   unless unzipInPath $     putStrLn "\n\nunzip is not in path; skipping testArchiveAndUnzip\n"

zip-archive.cabal view

@@ -1,5 +1,5 @@ Name:                zip-archive-Version:             0.4.2.1+Version:             0.4.2.2 Cabal-Version:       2.0 Build-type:          Simple Synopsis:            Library for creating and modifying zip archives.