Commit be58af2a authored by Emily Pillmore's avatar Emily Pillmore

rename TargzFormat -> TarGzArchive

parent cce76220
......@@ -375,7 +375,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
unless (Map.null targets) $
mapM_
(\(SpecificSourcePackage pkg) -> packageToSdist verbosity
(distProjectRootDirectory localDistDirLayout) TargzFormat
(distProjectRootDirectory localDistDirLayout) TarGzArchive
(distSdistFile localDistDirLayout (packageId pkg)) pkg
) (localPackages localBaseCtx)
......
......@@ -170,7 +170,7 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do
format =
if | listSources, nulSeparated -> SourceList '\0'
| listSources -> SourceList '\n'
| otherwise -> TargzFormat
| otherwise -> TarGzArchive
outputPath pkg = case mOutputPath' of
Just path
......@@ -194,7 +194,7 @@ data IsExec = Exec | NoExec
deriving (Show, Eq)
data OutputFormat = SourceList Char
| TargzFormat
| TarGzArchive
deriving (Show, Eq)
packageToSdist :: Verbosity -> FilePath -> OutputFormat -> FilePath -> UnresolvedSourcePackage -> IO ()
......@@ -216,7 +216,7 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
case dir0 of
Left tgz -> do
case format of
TargzFormat -> do
TarGzArchive -> do
write =<< BSL.readFile tgz
when (outputFile /= "-") $
notice verbosity $ "Wrote tarball sdist to " ++ outputFile ++ "\n"
......@@ -238,7 +238,7 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
write (BSL.pack . (++ [nulSep]) . intercalate [nulSep] . fmap ((prefix </>) . snd) $ files)
when (outputFile /= "-") $
notice verbosity $ "Wrote source list to " ++ outputFile ++ "\n"
TargzFormat -> do
TarGzArchive -> do
let entriesM :: StateT (Set.Set FilePath) (WriterT [Tar.Entry] IO) ()
entriesM = do
let prefix = prettyShow (packageId pkg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment