Skip to content
Snippets Groups Projects

Allow unpacking legacy lzma archives, fixes #307

Merged Julian Ospald requested to merge issue-307 into master
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
+ 2
2
@@ -715,7 +715,7 @@ unpackToDir dfp av = do
@@ -715,7 +715,7 @@ unpackToDir dfp av = do
(untar . GZip.decompress =<< rf av)
(untar . GZip.decompress =<< rf av)
| ".tar.xz" `isSuffixOf` fn -> do
| ".tar.xz" `isSuffixOf` fn -> do
filecontents <- liftE $ rf av
filecontents <- liftE $ rf av
let decompressed = Lzma.decompress filecontents
let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
liftE $ untar decompressed
liftE $ untar decompressed
| ".tar.bz2" `isSuffixOf` fn ->
| ".tar.bz2" `isSuffixOf` fn ->
liftE (untar . BZip.decompress =<< rf av)
liftE (untar . BZip.decompress =<< rf av)
@@ -744,7 +744,7 @@ getArchiveFiles av = do
@@ -744,7 +744,7 @@ getArchiveFiles av = do
(entries . GZip.decompress =<< rf av)
(entries . GZip.decompress =<< rf av)
| ".tar.xz" `isSuffixOf` fn -> do
| ".tar.xz" `isSuffixOf` fn -> do
filecontents <- liftE $ rf av
filecontents <- liftE $ rf av
let decompressed = Lzma.decompress filecontents
let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
liftE $ entries decompressed
liftE $ entries decompressed
| ".tar.bz2" `isSuffixOf` fn ->
| ".tar.bz2" `isSuffixOf` fn ->
liftE (entries . BZip.decompress =<< rf av)
liftE (entries . BZip.decompress =<< rf av)
Loading