Moved ignoreCheck inside checkSDistTarball

Author: martin-kolinek

src/Stack/SDist.hs

@@ -336,12 +336,20 @@ dirsFromFiles dirs = Set.toAscList (Set.delete "." results)
 --
 -- Note that we temporarily decompress the archive to analyze it.
 checkSDistTarball :: (StackM env m, HasEnvConfig env, MonadBaseUnlift IO m)
-  => Path Abs File -- ^ Absolute path to tarball
+  => SDistOpts -- ^ The configuration of what to check
+  -> Path Abs File -- ^ Absolute path to tarball
   -> m ()
-checkSDistTarball tarball = withTempTarGzContents tarball $ \pkgDir' -> do
+checkSDistTarball opts tarball = withTempTarGzContents tarball $ \pkgDir' -> do
     pkgDir  <- (pkgDir' </>) `liftM`
         (parseRelDir . FP.takeBaseName . FP.takeBaseName . toFilePath $ tarball)
     --               ^ drop ".tar"     ^ drop ".gz"
+    buildExtractedTarball pkgDir
+    unless (sdoptsIgnoreCheck opts) (checkPackageInExtractedTarball pkgDir)
+
+checkPackageInExtractedTarball :: (StackM env m, HasEnvConfig env, MonadBaseUnlift IO m)
+  => Path Abs Dir -- ^ Absolute path to tarball
+  -> m ()
+checkPackageInExtractedTarball pkgDir = do
     cabalfp <- findOrGenerateCabalFile pkgDir
     name    <- parsePackageNameFromFilePath cabalfp
     config  <- getDefaultPackageConfig
@@ -405,13 +413,14 @@ buildExtractedTarball pkgDir = do
 -- | Version of 'checkSDistTarball' that first saves lazy bytestring to
 -- temporary directory and then calls 'checkSDistTarball' on it.
 checkSDistTarball' :: (StackM env m, HasEnvConfig env, MonadBaseUnlift IO m)
-  => String       -- ^ Tarball name
+  => SDistOpts
+  -> String       -- ^ Tarball name
   -> L.ByteString -- ^ Tarball contents as a byte string
   -> m ()
-checkSDistTarball' name bytes = withSystemTempDir "stack" $ \tpath -> do
+checkSDistTarball' opts name bytes = withSystemTempDir "stack" $ \tpath -> do
     npath   <- (tpath </>) `liftM` parseRelFile name
     liftIO $ L.writeFile (toFilePath npath) bytes
-    checkSDistTarball npath
+    checkSDistTarball opts npath
 
 withTempTarGzContents :: (MonadIO m, MonadMask m)
   => Path Abs File         -- ^ Location of tarball

src/main/Main.hs

@@ -674,8 +674,7 @@ uploadCmd sdistOpts go = do
     withBuildConfigAndLock go $ \_ -> do
         config <- view configL
         getCreds <- liftIO (runOnce (Upload.loadCreds config))
-        unless (sdoptsIgnoreCheck sdistOpts) $
-            mapM_ (resolveFile' >=> checkSDistTarball) files
+        mapM_ (resolveFile' >=> checkSDistTarball sdistOpts) files
         forM_
             files
             (\file ->
@@ -693,7 +692,7 @@ uploadCmd sdistOpts go = do
             forM_ dirs $ \dir -> do
                 pkgDir <- resolveDir' dir
                 (tarName, tarBytes, mcabalRevision) <- getSDistTarball (sdoptsPvpBounds sdistOpts) pkgDir
-                unless (sdoptsIgnoreCheck sdistOpts) $ checkSDistTarball' tarName tarBytes
+                checkSDistTarball' sdistOpts tarName tarBytes
                 liftIO $ do
                   creds <- getCreds
                   Upload.uploadBytes creds tarName tarBytes
@@ -720,7 +719,7 @@ sdistCmd sdistOpts go =
             tarPath <- (distDir </>) <$> parseRelFile tarName
             ensureDir (parent tarPath)
             liftIO $ L.writeFile (toFilePath tarPath) tarBytes
-            unless (sdoptsIgnoreCheck sdistOpts) (checkSDistTarball tarPath)
+            checkSDistTarball sdistOpts tarPath
             $logInfo $ "Wrote sdist tarball to " <> T.pack (toFilePath tarPath)
             when (sdoptsSign sdistOpts) (void $ Sig.sign (sdoptsSignServerUrl sdistOpts) tarPath)