Control: tag -1 patch

Good to know that etch works now :)

On Sat, Jan 05, 2019 at 04:25:34PM +0100, Thorsten Glaser wrote:
> I: Extracting source
> dpkg-source: -x needs exactly one argument, the .dsc
...
> E: pbuilder: Failed extracting the source

I think this may be a logic error that could be fixed by this patch
(this is the simplest that came to my mind), could you please test it?
I'm not quite up to set up a test env for sarge myself…

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 9a5eaf0..d43cec1 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -126,10 +126,12 @@ copydsc "$PACKAGENAME" "${BUILDPLACE}$BUILDDIR"
 copyinputfile "${BUILDPLACE}$BUILDDIR"

 # don't allow empty values of BUILDSUBDIR
-if [ -n "${BUILDSUBDIR:-}" ] && package_version_is_older_than dpkg-dev 
1.13.19; then
+if package_version_is_older_than dpkg-dev 1.13.19; then
         # dpkg-source back then (2005-06-12) didn't allow to specify the
         # extraction directory.
-        log.w "dpkg is too old in the chroot, can't use the specified 
BUILDSUBDIR"
+        if [ -n "${BUILDSUBDIR:-}" ]; then
+            log.w "dpkg is too old in the chroot, can't use the specified 
BUILDSUBDIR"
+        fi
         cannot_change_subdir=yes
         BUILDSUBDIR=
 fi



-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

Attachment: signature.asc
Description: PGP signature

Reply via email to