@@ -15,7 +15,7 @@ module RpcClient (
15
15
) where
16
16
17
17
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
19
19
import Codec.Compression.BZip qualified as BZ2
20
20
import Codec.Compression.GZip qualified as GZip
21
21
import Control.Exception
@@ -505,20 +505,20 @@ runTarball common (Just sock) tarFile keepGoing runOnly compareDetails = do
505
505
| " .tar.bz2" `isSuffixOf` takeExtensions tarFile = Tar. read . BZ2. decompress
506
506
| otherwise = Tar. read
507
507
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
510
510
-- probe server connection before doing anything, display
511
511
-- instructions unless server was found.
512
- runAllRequests checked sock
512
+ runAllRequests entries sock
513
513
where
514
- runAllRequests ::
515
- Tar. Entries ( Either Tar. FormatError Tar. FileNameError ) -> Socket -> IO ()
514
+ -- runAllRequests ::
515
+ -- Tar.Entries Tar.FormatError -> Socket -> IO ()
516
516
runAllRequests checked skt = cancelIfInterrupted skt $ do
517
517
withTempDir $ \ tmp -> withLogLevel common. logLevel $ do
518
518
-- unpack relevant tar files (rpc_* directories only)
519
519
logInfo_ $ unwords [" unpacking json files from tarball" , tarFile, " into" , tmp]
520
520
(jsonFiles, sequenceMap) <-
521
- liftIO $ Tar. foldEntries (unpackIfRpc tmp) (pure mempty ) throwAnyError checked
521
+ liftIO $ Tar. foldEntries (unpackIfRpc tmp) (pure mempty ) ( error . show ) checked
522
522
logInfo_ $ " RPC data:" <> show jsonFiles
523
523
logInfo_ $ " Sequence data:" <> show sequenceMap
524
524
0 commit comments