Merge pull request #5758 from emilypi/emilypi/remove-zip-sdist

Fix Incorrect `tar.gz` Extension
haskell · Dec 2, 2018 · a29abd1 · a29abd1
2 parents dd745a9 + f826dc0
commit a29abd1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs
@@ -172,10 +172,14 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do
                | listSources               -> SourceList '\n'
                | otherwise                 -> TarGzArchive
 
+        ext = case format of
+                SourceList _  -> "list"
+                TarGzArchive  -> "tar.gz"
+
         outputPath pkg = case mOutputPath' of
             Just path
                 | path == "-" -> "-"
-                | otherwise   -> path </> prettyShow (packageId pkg) <.> "tar.gz"
+                | otherwise   -> path </> prettyShow (packageId pkg) <.> ext
             Nothing
                 | listSources -> "-"
                 | otherwise   -> distSdistFile distLayout (packageId pkg)