[Pkg-haskell-commits] darcs: haskell-devscripts: Better error checking when figuring out providing package, should help debug or even fix bug #588001.

[Joachim Breitner]

Tue Jul  6 09:18:04 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Better error checking when figuring out providing package, should help debug or even fix bug #588001. 
  Ignore-this: db7b19fbdcc52e9a932331d603ea15c2

    M ./Dh_Haskell.sh -2 +11
    M ./debian/changelog +7

Tue Jul  6 09:18:04 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Better error checking when figuring out providing package, should help debug or even fix bug #588001. 
  Ignore-this: db7b19fbdcc52e9a932331d603ea15c2
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2010-07-06 09:21:49.299516704 +0000
+++ new-haskell-devscripts/debian/changelog	2010-07-06 09:21:49.303516917 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.7.11) UNRELEASED; urgency=low
+
+  * Better error checking when figuring out providing package, should help
+    debug or even fix bug #588001. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 06 Jul 2010 11:16:35 +0200
+
 haskell-devscripts (0.7.10) unstable; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
--- old-haskell-devscripts/Dh_Haskell.sh	2010-07-06 09:21:49.299516704 +0000
+++ new-haskell-devscripts/Dh_Haskell.sh	2010-07-06 09:21:49.299516704 +0000
@@ -122,6 +122,8 @@
           then
 	      dep=`dependency $pkg`
 	      packages="$packages, $dep"
+	  else
+	      echo "WARNING: No Debian package provides haskell package $pkgid."
           fi
         else
 	    packages="$packages, $dep"
@@ -140,9 +142,16 @@
 	if [ -z "$dep" ]
 	then
 	  pkg=`providing_package_for_ghc6_prof $pkgid`
-	  dep=`dependency $pkg`
+          if [ -n "$pkg" ]
+          then
+	      dep=`dependency $pkg`
+	      packages="$packages, $dep"
+	  else
+	      echo "WARNING: No Debian package provides haskell package $pkgid."
+          fi
+        else
+	    packages="$packages, $dep"
 	fi
-	packages="$packages, $dep"
     done
 
     echo $packages | sed -e 's/^,[ ]*//'