From fb73435572b76a665dc3a2c079e2be3cdff1eb15 Mon Sep 17 00:00:00 2001
From: Chris Done <chrisdone@gmail.com>
Date: Wed, 31 Dec 2014 19:42:53 +0100
Subject: [PATCH] Split off uploading into separate finallyUpload

---
 Stackage/CompleteBuild.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Stackage/CompleteBuild.hs b/Stackage/CompleteBuild.hs
index 39930292..b7b5550e 100644
--- a/Stackage/CompleteBuild.hs
+++ b/Stackage/CompleteBuild.hs
@@ -155,12 +155,14 @@ justCheck = withManager tlsManagerSettings $ \man -> do
 
     putStrLn "Plan seems valid!"
 
+-- | Make a complete plan, build, test and upload bundle, docs and
+-- distro.
 completeBuild :: BuildType -> BuildFlags -> IO ()
 completeBuild buildType buildFlags = withManager tlsManagerSettings $ \man -> do
     hSetBuffering stdout LineBuffering
 
     putStrLn $ "Loading settings for: " ++ tshow buildType
-    Settings {..} <- getSettings man buildType
+    settings@Settings {..} <- getSettings man buildType
 
     putStrLn $ "Writing build plan to: " ++ fpToText planFile
     encodeFile (fpToString planFile) plan
@@ -180,6 +182,12 @@ completeBuild buildType buildFlags = withManager tlsManagerSettings $ \man -> do
             }
     performBuild pb >>= mapM_ putStrLn
 
+    finallyUpload settings man pb
+
+-- | The final part of the complete build process: uploading a bundle,
+-- docs and a distro to hackage.
+finallyUpload :: Settings -> Manager -> PerformBuild -> IO ()
+finallyUpload Settings{..} man pb = do
     putStrLn "Uploading bundle to Stackage Server"
     token <- readFile "/auth-token"
     now <- epochTime