[pkg-haskell-tools] 02/03: make-all: Ignore directories in p/ that do not look like package sources

Joachim Breitner nomeata at moszumanska.debian.org
Tue Aug 18 10:17:19 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 a3fef3ec7d75de8e5ddb9123a3441c23597ee977
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Aug 18 12:01:04 2015 +0200

    make-all: Ignore directories in p/ that do not look like package sources
---
 src/make-all.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index c7778d8..a291c35 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -260,8 +260,11 @@ shakeMain conf@(Conf {..}) = do
         sources <- getDirectoryDirs "p"
         excluded <- getExcludedSources (GetExcludedSources ())
         let sources' = filter (`notElem` excluded) sources
+        sources'' <- flip filterM sources' $ \s ->
+            (&&) <$> doesFileExist ("p" </> s </> "debian" </> "control")
+                 <*> doesFileExist ("p" </> s </> "debian" </> "changelog")
         putNormal "# enumerating sources..."
-        writeFileChanged out (unlines sources')
+        writeFileChanged out (unlines sources'')
 
     targetDir </> "cache/all-binaries.txt" %> \out -> do
         sources <- readFileLines $ targetDir </> "cache/sources.txt"

-- 
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