Merge pull request #4117 from isovector/issue-4112

Mention tarball earlier in sdist
commercialhaskell · Jul 1, 2018 · 8188999 · 8188999
2 parents d444a80 + 57244a6
commit 8188999
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -14,6 +14,8 @@ Behavior changes:
 * `stack build` will now announce when sublibraries of a package are being
   build, in the same way executables, tests, benchmarks and libraries are
   announced
+* `stack sdist` will now announce the destination of the generated tarball,
+    regardless of whether or not it passed the sanity checks
 * The `--upgrade-cabal` option to `stack setup` has been
   deprecated. This feature no longer works with GHC 8.2 and
   later. Furthermore, the reason for this flag originally being

diff --git a/src/main/Main.hs b/src/main/Main.hs
@@ -776,8 +776,8 @@ sdistCmd sdistOpts go =
             tarPath <- (distDir </>) <$> parseRelFile tarName
             ensureDir (parent tarPath)
             liftIO $ L.writeFile (toFilePath tarPath) tarBytes
-            checkSDistTarball sdistOpts tarPath
             prettyInfoL [flow "Wrote sdist tarball to", display tarPath]
+            checkSDistTarball sdistOpts tarPath
             forM_ (sdoptsTarPath sdistOpts) $ copyTarToTarPath tarPath tarName
             when (sdoptsSign sdistOpts) (void $ Sig.sign (sdoptsSignServerUrl sdistOpts) tarPath)
         where