[pkg-haskell-tools] 04/04: Fixed removal of excluded packages.

[Sven Bartscher]

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

svenb-guest pushed a commit to branch short-names
in repository pkg-haskell-tools.

commit e9f0742b80f54b1a4ad69b56c40a1aa0bb431560
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Thu Aug 20 13:50:24 2015 +0200

    Fixed removal of excluded packages.
---
 src/make-all.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/make-all.hs b/src/make-all.hs
index 0b8edb7..eea8ee1 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -26,8 +26,6 @@ import Development.Shake.FilePath
 import Debian.Relation.Common
 import Debian.Control.String
 import Debian.Control.Policy
-import qualified Debian.Changes as DC
-import qualified Debian.Version.Common as DC
 
 import Text.Parsec hiding (option, oneOf)
 import Text.Parsec.String
@@ -305,12 +303,11 @@ testBindMount (Conf {..}) act = do
 
 getSourcePackages :: [FilePath] -> IO [FilePath]
 getSourcePackages excluded = do
-  sources <- listContents "p" -- Filtering out files can be avoided, because a file can't contain a debian directory and will be filtered out in the next step.
+  sources <- map takeFileName <$> listContents "p" -- Filtering out files can be avoided, because a file can't contain a debian directory and will be filtered out in the next step.
   let sources' = filter (`notElem` excluded) sources
-  sources'' <- flip filterM sources' $ \s ->
-      (&&) <$> System.Directory.doesFileExist (s </> "debian/control")
-           <*> System.Directory.doesFileExist (s </> "debian/changelog")
-  return $ map takeFileName sources''
+  flip filterM sources' $ \s ->
+      (&&) <$> System.Directory.doesFileExist ("p" </> s </> "debian/control")
+           <*> System.Directory.doesFileExist ("p" </> s </> "debian/changelog")
 
 makeShakeOptions :: Conf -> ShakeOptions
 makeShakeOptions Conf{..} = shakeOptions

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