[pkg-haskell-tools] 01/01: make-all: The arch of a binary is not the arch of the changes
Joachim Breitner
nomeata at moszumanska.debian.org
Wed Aug 19 20:41:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch architectures
in repository pkg-haskell-tools.
commit 0acb352caeda24a148187e0642ca6f330fb9d67b
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Wed Aug 19 22:40:42 2015 +0200
make-all: The arch of a binary is not the arch of the changes
if the binary is arch all.
---
src/make-all.hs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/make-all.hs b/src/make-all.hs
index 0f031d0..0f4cbff 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -387,8 +387,9 @@ shakeMain conf@(Conf {..}) = do
-- Binary packages depend on the corresponding changes file log
targetDir </> "*.deb" %> \out -> do
let filename = takeFileName out
- let (_pkgname,version,arch) = splitDebName filename
- ensureArch arch
+ let (_pkgname,version,binArch) = splitDebName filename
+ ensureArch binArch -- binArch could be all, so do not use it later
+ arch <- askOracle (GetArch ())
sourceMB <- debBuiltBy filename
case sourceMB of
Nothing -> fail $ "File " ++ filename ++ " not built by us."
--
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