[pkg-haskell-tools] 03/03: make-all: Move status messages after depedency calculation

Joachim Breitner nomeata at moszumanska.debian.org
Fri Aug 14 11:53:22 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 0bb8c6bdcdc0c1a53e4cf0de52bfa67adcc9faf8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Aug 14 12:13:52 2015 +0200

    make-all: Move status messages after depedency calculation
---
 src/make-all.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index 78012c3..631755b 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -256,25 +256,25 @@ shakeMain conf@(Conf {..}) = do
         return $ excludedPackages
 
     targetDir </> "cache/sources.txt" %> \out -> do
-        putNormal "# enumerating sources..."
         sources <- getDirectoryDirs "p"
         excluded <- getExcludedSources (GetExcludedSources ())
         let sources' = filter (`notElem` excluded) sources
+        putNormal "# enumerating sources..."
         writeFileChanged out (unlines sources')
 
     targetDir </> "cache/all-binaries.txt" %> \out -> do
-        putNormal "# enumerating all binaries..."
         sources <- readFileLines $ targetDir </> "cache/sources.txt"
         binaries <- concat <$> mapM readFileLines
             [ targetDir </> "cache" </> "binaries" </> s <.> "txt" | s <- sources ]
+        putNormal "# enumerating all binaries..."
         writeFileChanged out $ unlines binaries
 
     targetDir </> "cache/built-by.txt" %> \out -> do
-        putNormal "# building built-by cache..."
         sources <- readFileLines $ targetDir </> "cache/sources.txt"
         builtBy <- liftM (sort . concat) $ forM sources $ \s -> do
             pkgs <- readFileLines $ targetDir </> "cache/binaries/" ++ s ++ ".txt"
             return [(pkg,s) | pkg <- pkgs]
+        putNormal "# building built-by cache..."
         writeFileChanged out $ unlines [ unwords [pkg,s] | (pkg,s) <- builtBy ]
 
     -- This maps binary package _file_ names built by us to source package names

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git



More information about the Pkg-haskell-commits mailing list