mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-30 08:00:25 +01:00
tar 0.3
This commit is contained in:
parent
9d74f661de
commit
5697fdd417
@ -1,3 +1,4 @@
|
|||||||
|
{-# LANGUAGE CPP #-}
|
||||||
module Stackage.LoadDatabase where
|
module Stackage.LoadDatabase where
|
||||||
|
|
||||||
import qualified Codec.Archive.Tar as Tar
|
import qualified Codec.Archive.Tar as Tar
|
||||||
@ -43,8 +44,11 @@ loadPackageDB core deps = do
|
|||||||
lbs <- L.readFile tarName
|
lbs <- L.readFile tarName
|
||||||
addEntries mempty $ Tar.read lbs
|
addEntries mempty $ Tar.read lbs
|
||||||
where
|
where
|
||||||
addEntries :: PackageDB -> Tar.Entries Tar.FormatError -> IO PackageDB
|
#if MIN_VERSION_tar(0, 4, 0)
|
||||||
addEntries _ (Tar.Fail e) = throwIO e
|
addEntries _ (Tar.Fail e) = throwIO e
|
||||||
|
#else
|
||||||
|
addEntries _ (Tar.Fail e) = error e
|
||||||
|
#endif
|
||||||
addEntries db Tar.Done = return db
|
addEntries db Tar.Done = return db
|
||||||
addEntries db (Tar.Next e es) = addEntry db e >>= flip addEntries es
|
addEntries db (Tar.Next e es) = addEntry db e >>= flip addEntries es
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
{-# LANGUAGE CPP #-}
|
||||||
module Stackage.Tarballs
|
module Stackage.Tarballs
|
||||||
( makeTarballs
|
( makeTarballs
|
||||||
) where
|
) where
|
||||||
@ -26,7 +27,11 @@ makeTarballs ii = do
|
|||||||
createDirectoryIfMissing True $ takeDirectory extraTar
|
createDirectoryIfMissing True $ takeDirectory extraTar
|
||||||
L.writeFile extraTar $ Tar.write extraEntries
|
L.writeFile extraTar $ Tar.write extraEntries
|
||||||
where
|
where
|
||||||
|
#if MIN_VERSION_tar(0, 4, 0)
|
||||||
loop _ _ (Tar.Fail err) = throwIO err
|
loop _ _ (Tar.Fail err) = throwIO err
|
||||||
|
#else
|
||||||
|
loop _ _ (Tar.Fail err) = error err
|
||||||
|
#endif
|
||||||
loop stable extra Tar.Done = return (stable [], extra [])
|
loop stable extra Tar.Done = return (stable [], extra [])
|
||||||
loop stable extra (Tar.Next e es) =
|
loop stable extra (Tar.Next e es) =
|
||||||
loop stable' extra' es
|
loop stable' extra' es
|
||||||
|
|||||||
@ -30,7 +30,7 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, containers
|
, containers
|
||||||
, Cabal
|
, Cabal
|
||||||
, tar >= 0.4
|
, tar >= 0.3
|
||||||
, bytestring
|
, bytestring
|
||||||
, directory
|
, directory
|
||||||
, filepath
|
, filepath
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user