Skip to content

Commit df11327

Browse files
committed
Adapt code to tar-0.6
1 parent ba5f771 commit df11327

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

booster/tools/rpc-client/RpcClient.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module RpcClient (
1515
) where
1616

1717
import Codec.Archive.Tar qualified as Tar
18-
import Codec.Archive.Tar.Check qualified as Tar
18+
import Codec.Archive.Tar.Entry qualified as Tar
1919
import Codec.Compression.BZip qualified as BZ2
2020
import Codec.Compression.GZip qualified as GZip
2121
import Control.Exception
@@ -505,20 +505,20 @@ runTarball common (Just sock) tarFile keepGoing runOnly compareDetails = do
505505
| ".tar.bz2" `isSuffixOf` takeExtensions tarFile = Tar.read . BZ2.decompress
506506
| otherwise = Tar.read
507507

508-
containedFiles <- unpackTar <$> BS.readFile tarFile
509-
let checked = Tar.checkSecurity containedFiles
508+
entries <- Tar.decodeLongNames . unpackTar <$> BS.readFile tarFile
509+
-- let checked = Tar.checkSecurity containedFiles
510510
-- probe server connection before doing anything, display
511511
-- instructions unless server was found.
512-
runAllRequests checked sock
512+
runAllRequests entries sock
513513
where
514-
runAllRequests ::
515-
Tar.Entries (Either Tar.FormatError Tar.FileNameError) -> Socket -> IO ()
514+
-- runAllRequests ::
515+
-- Tar.Entries Tar.FormatError -> Socket -> IO ()
516516
runAllRequests checked skt = cancelIfInterrupted skt $ do
517517
withTempDir $ \tmp -> withLogLevel common.logLevel $ do
518518
-- unpack relevant tar files (rpc_* directories only)
519519
logInfo_ $ unwords ["unpacking json files from tarball", tarFile, "into", tmp]
520520
(jsonFiles, sequenceMap) <-
521-
liftIO $ Tar.foldEntries (unpackIfRpc tmp) (pure mempty) throwAnyError checked
521+
liftIO $ Tar.foldEntries (unpackIfRpc tmp) (pure mempty) (error . show) checked
522522
logInfo_ $ "RPC data:" <> show jsonFiles
523523
logInfo_ $ "Sequence data:" <> show sequenceMap
524524

0 commit comments

Comments
 (0)