Bug#472407: [patch] possible fix

[Michael Vogt]

Hi,

attached is the diff that we used in ubuntu to fix the problem. 

Cheers,
 Michael
-------------- next part --------------
diff -Nru pbuilder-0.181ubuntu2/debian/changelog pbuilder-0.181ubuntu3/debian/changelog
--- pbuilder-0.181ubuntu2/debian/changelog	2008-06-20 11:00:52.000000000 +0200
+++ pbuilder-0.181ubuntu3/debian/changelog	2008-06-23 21:18:05.000000000 +0200
@@ -1,3 +1,11 @@
+pbuilder (0.181ubuntu3) intrepid; urgency=low
+
+  * Fix pbuilder-satisfydepends-gdebi:
+    gdebi needs to be called from outside the chroot as the .dsc file isn't
+    copied yet into the chroot (Closes: #472407, LP: #242449).
+
+ -- Michael Bienia <geser at ubuntu.com>  Mon, 23 Jun 2008 21:17:53 +0200
+
 pbuilder (0.181ubuntu2) intrepid; urgency=low
 
   * debian/rules: s/ -a/ -s/ to fix FTBFS on powerpc (LP: #184218)
diff -Nru pbuilder-0.181ubuntu2/pbuilder-satisfydepends-checkparams pbuilder-0.181ubuntu3/pbuilder-satisfydepends-checkparams
--- pbuilder-0.181ubuntu2/pbuilder-satisfydepends-checkparams	2008-05-25 00:54:05.000000000 +0200
+++ pbuilder-0.181ubuntu3/pbuilder-satisfydepends-checkparams	2008-06-23 21:06:29.000000000 +0200
@@ -20,6 +20,7 @@
 
 
 DEBIAN_CONTROL=debian/control
+CHROOT=""
 CHROOTEXEC=""
 BD_REGEXP="build-(depends|depends-indep)"
 BC_REGEXP="build-(conflicts|conflicts-indep)"
@@ -34,6 +35,7 @@
 	    shift; shift
 	    ;;
 	--chroot)
+	    CHROOT="$2"
 	    CHROOTEXEC="chroot $2 "
 	    shift; shift
 	    ;;
diff -Nru pbuilder-0.181ubuntu2/pbuilder-satisfydepends-gdebi pbuilder-0.181ubuntu3/pbuilder-satisfydepends-gdebi
--- pbuilder-0.181ubuntu2/pbuilder-satisfydepends-gdebi	2008-01-07 00:41:09.000000000 +0100
+++ pbuilder-0.181ubuntu3/pbuilder-satisfydepends-gdebi	2008-06-23 21:19:19.000000000 +0200
@@ -23,8 +23,7 @@
 set -e
 
 function checkbuilddep_internal () {
-    $CHROOTEXEC apt-get -y --force-yes install gdebi-core
-    INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $DEBIAN_CONTROL)
+    INSTALL=$(/usr/bin/gdebi --quiet --root $CHROOT --apt-line $DEBIAN_CONTROL)
     $CHROOTEXEC /usr/bin/apt-get install -y $INSTALL
 }