From cd524abb8006c73b77419551510693dbac9d7bb8 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Sun, 2 Dec 2018 16:18:37 -0500 Subject: [PATCH 1/4] fix for improper .tar.gz designation --- cabal-install/Distribution/Client/CmdSdist.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs index d79b3ff9e6f..898f3ee0e0f 100644 --- 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" + TargzFormat -> "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) From 74a3787643c97439065193ea77c3ca5a800c6266 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Sun, 2 Dec 2018 16:19:43 -0500 Subject: [PATCH 2/4] spelling --- cabal-install/Distribution/Client/CmdSdist.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs index 898f3ee0e0f..e4424b440e1 100644 --- a/cabal-install/Distribution/Client/CmdSdist.hs +++ b/cabal-install/Distribution/Client/CmdSdist.hs @@ -174,7 +174,7 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do ext = case format of SourceList _ -> "list" - TargzFormat -> "tar.gz" + TarGzFormat -> "tar.gz" outputPath pkg = case mOutputPath' of Just path From 702f5c143e9354165f1e7c7fc612e0c08e393234 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Sun, 2 Dec 2018 16:20:04 -0500 Subject: [PATCH 3/4] formatting --- cabal-install/Distribution/Client/CmdSdist.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs index e4424b440e1..68dc0fb8016 100644 --- a/cabal-install/Distribution/Client/CmdSdist.hs +++ b/cabal-install/Distribution/Client/CmdSdist.hs @@ -173,8 +173,8 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do | otherwise -> TarGzArchive ext = case format of - SourceList _ -> "list" - TarGzFormat -> "tar.gz" + SourceList _ -> "list" + TarGzFormat -> "tar.gz" outputPath pkg = case mOutputPath' of Just path From f826dc0548672c632cacd6ff2857c1ce7422f648 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Sun, 2 Dec 2018 16:23:53 -0500 Subject: [PATCH 4/4] format -> archive --- cabal-install/Distribution/Client/CmdSdist.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs index 68dc0fb8016..bbaaee3e7b1 100644 --- a/cabal-install/Distribution/Client/CmdSdist.hs +++ b/cabal-install/Distribution/Client/CmdSdist.hs @@ -173,8 +173,8 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do | otherwise -> TarGzArchive ext = case format of - SourceList _ -> "list" - TarGzFormat -> "tar.gz" + SourceList _ -> "list" + TarGzArchive -> "tar.gz" outputPath pkg = case mOutputPath' of Just path