[pkg-haskell-tools] 01/02: Make dht make-all a bit more chatty

[Joachim Breitner]

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 24456156ac7b97e019b366690d12edf28fbd4cbd
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Aug 13 18:21:03 2015 +0200

    Make dht make-all a bit more chatty
---
 src/make-all.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index 20684aa..55a1500 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -253,18 +253,21 @@ 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
         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 ]
         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"
@@ -272,6 +275,7 @@ shakeMain conf@(Conf {..}) = do
         writeFileChanged out $ unlines [ unwords [pkg,s] | (pkg,s) <- builtBy ]
 
     builtByMap <- newCache $ \() -> do
+        putNormal "# reading built-by cache..."
         builtBy <- readFileLines $ targetDir </> "cache/built-by.txt"
         return $ M.fromList [ (p,s) | [p,s] <- words <$> builtBy ]
 
@@ -283,6 +287,7 @@ shakeMain conf@(Conf {..}) = do
         builtBy = getBuiltBy . GetBuiltBy
 
     targetDir </> "cache/all-changes-files.txt" %> \out -> do
+        putNormal "# enumerating all changes files..."
         sources <- readFileLines $ targetDir </> "cache/sources.txt"
         versioned <- forM sources $ \s -> do
             v <- versionOfSource s
@@ -291,6 +296,7 @@ shakeMain conf@(Conf {..}) = do
 
     targetDir </> "cache/binaries/*.txt" %> \out -> do
         let s = dropExtension $ takeFileName $ out
+        putNormal $ "# enumerating binaries of " ++ show s
         pkgs <- binaryPackagesOfSource s
         v <- versionOfSource s
 
@@ -364,7 +370,7 @@ shakeMain conf@(Conf {..}) = do
             -- Add the sources to the changes file. We do not simply pass
             -- "-s" to sbuild, as it would make sbuild re-create and override the .dsc file
             -- which confuses the build system.
-            unit $ cmd "changestool" (targetDir </> changes) "adddsc" (targetDir </> dsc)
+            unit $ cmd ["changestool", targetDir </> changes, "adddsc", targetDir </> dsc]
 
 
     -- Build log depends on the corresponding source, and the dependencies
@@ -374,6 +380,6 @@ shakeMain conf@(Conf {..}) = do
         ensureVersion source version
         sourceFiles <- getDirectoryFiles ("p" </> source) ["debian//*"]
         need [ "p" </> source </> f | f <- sourceFiles]
-        unit $ cmd  (EchoStdout False) "dht" "debian2dsc" "-o" targetDir ("p" </> source </> "debian")
+        unit $ cmd  (EchoStdout False) (Traced "debian2dsc") "dht" "debian2dsc" "-o" targetDir ("p" </> source </> "debian")
 
 

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