Bug#803687: haskell-devscripts: should refuse to create an empty documentation packages

[Chris Lamb]

Package: haskell-devscripts
Version: 0.9.11
Tags: patch

Hi,

haskell-devscripts currently ignores errors when generating haddock
documentation. This seems like a mistake as it:

 a) Masks underlying problems in haddock and/or the build environment
 (eg. #738372)

 b) Results in empty -doc packages

Patch attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-

diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh
index eba8c30..ca9be57 100644
--- a/Dh_Haskell.sh
+++ b/Dh_Haskell.sh
@@ -419,8 +419,11 @@ haddock_recipe(){
     # local PS5=$PS4; PS4=" + haddock_recipe> "; set -x
     hc=`packages_hc`
     haddock=`hc_haddock ${hc}`
-    [ ! -x /usr/bin/${haddock} ] || run ${DEB_SETUP_BIN_NAME} haddock 
--builddir=dist-${hc} --with-haddock=/usr/bin/${haddock} --with-ghc=${hc} 
${DEB_HADDOCK_OPTS} || \
-          echo "Haddock failed (no modules?), creating empty documentation 
package."
+    if [ -x /usr/bin/${haddock} ] && \
+          ! run ${DEB_SETUP_BIN_NAME} haddock --builddir=dist-${hc} 
--with-haddock=/usr/bin/${haddock} --with-ghc=${hc} ${DEB_HADDOCK_OPTS} ; then
+       echo "Haddock failed (no modules?), refusing to create empty 
documentation package."
+       exit 1
+    fi
     # PS4=$PS5
 }