[buildd-tools-devel] Bug#538085: sbuild: Build directory not cleaned under certain failure conditions

[Roger Leigh]

Package: sbuild
Version: 0.58.6-1
Severity: normal
Tags: patch

15:30 < phil> rleigh: Even on $purge_build_directory="always"; there are
              leftovers in /build/ in the chroot if the source downloaded
              correctly but build-dependencies fail to download.  Could you
              look into that, please?

Possibly fixed by the following to ensure packages are cleaned up on
failure to fetch source files or subsequent failures.


diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index a2cbf78..1100b72 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -264,7 +264,7 @@ sub run {
 
     $self->set('Pkg Fail Stage', 'fetch-src');
     if (!$self->fetch_source_files()) {
-	goto cleanup_close;
+	goto cleanup_packages;
     }
 
     # Run setup-hook before processing deps and build
@@ -278,7 +278,7 @@ sub run {
 	if ($?) {
 	    $self->log("setup-hook failed\n");
 	    $self->set_status('skipped');
-	    goto cleanup_close;
+	    goto cleanup_packages;
 	}
     }
 

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (550, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages sbuild depends on:
ii  adduser                       3.110      add and remove users and groups
ii  libsbuild-perl                0.58.6-1   Tool for building Debian binary pa
ii  perl                          5.10.0-24  Larry Wall's Practical Extraction 
ii  perl-modules                  5.10.0-24  Core Perl modules

Versions of packages sbuild recommends:
ii  debootstrap                   1.0.13     Bootstrap a basic Debian system
ii  fakeroot                      1.12.4     Gives a fake root environment

Versions of packages sbuild suggests:
ii  deborphan                     1.7.28     program that can find unused packa
ii  wget                          1.11.4-2   retrieves files from the web

-- no debconf information