[pkg-haskell-tools] 01/05: Do not run changestool if sbuild already failed
Joachim Breitner
nomeata at moszumanska.debian.org
Fri Aug 14 09:03:20 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 aedbe625db2a6fa3fcd415757b8d6b96b1f1dc86
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Thu Aug 13 21:05:12 2015 +0200
Do not run changestool if sbuild already failed
---
debian/changelog | 6 ++++++
src/make-all.hs | 13 +++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c66ac1..7fbecc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-haskell-tools (0.7) UNRELEASED; urgency=medium
+
+ * Do not run changestool if sbuild already failed
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 13 Aug 2015 21:05:00 +0200
+
pkg-haskell-tools (0.6) unstable; urgency=medium
* New script: mass-change (really useful!)
diff --git a/src/make-all.hs b/src/make-all.hs
index 6291a53..946a1e7 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -381,16 +381,17 @@ shakeMain conf@(Conf {..}) = do
-- Run sbuild
Exit c <- cmd (Cwd targetDir) (EchoStdout False)
["sbuild", "-c", schrootName,"-A","--no-apt-update","--dist", distribution, "--chroot-setup-commands=bash "++fixup, dsc] ["--extra-package="++d | d <- localDebs ]
- unless (c == ExitSuccess) $ do
+ if (c == ExitSuccess)
+ then 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]
+ else do
putNormal $ "Failed to build " ++ source ++ "_" ++ version
ex <- liftIO $ System.Directory.doesFileExist out
putNormal $ "See " ++ out ++ " for details."
- -- 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]
-
-- Build log depends on the corresponding source, and the dependencies
targetDir </> "*.dsc" %> \out -> do
--
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