[Reproducible-commits] [sbuild] 01/02: Move running of pre-build-commands until after 'Chroot Dir' is defined

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch pu/reproducible_builds
in repository sbuild.

commit 373f56e0ff69b0975c5a69d08382a09e7fc9b0eb
Author: josch <j.schauer at email.de>
Date:   Thu Jan 1 15:12:46 2015 +0100

    Move running of pre-build-commands until after 'Chroot Dir' is defined
    
     - this prevents the %SBUILD_CHROOT_DIR percentage escape being empty
       when running the pre-build-commands hook
---
 debian/changelog    |  5 +++++
 lib/Sbuild/Build.pm | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46cca0d..6aeef32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ sbuild (0.65.1-1) UNRELEASED; urgency=medium
     are present in the arch list (Closes: #771235).  Thanks to
     Lennart Sorensen for this patch.
 
+  [ Johannes Schauer ]
+  * Move running of pre-build-commands until after 'Chroot Dir' is defined
+    - this prevents the %SBUILD_CHROOT_DIR percentage escape being empty
+      when running the pre-build-commands hook (Closes: #774359)
+
  -- Roger Leigh <rleigh at debian.org>  Sun, 30 Nov 2014 22:44:47 +0000
 
 sbuild (0.65.0-1) unstable; urgency=medium
diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index 155e4fc..56d9f59 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -365,12 +365,6 @@ sub run_chroot_session {
 					   $self->get_conf('CHROOT'),
 					   $self->get_conf('HOST_ARCH'));
 
-	# Run pre build external commands
-	$self->check_abort();
-	$self->run_external_commands("pre-build-commands",
-				     $self->get_conf('LOG_EXTERNAL_COMMAND_OUTPUT'),
-				     $self->get_conf('LOG_EXTERNAL_COMMAND_ERROR'));
-
 	$self->check_abort();
 	if (!$session->begin_session()) {
 	    Sbuild::Exception::Build->throw(error => "Error creating chroot session: skipping " .
@@ -401,6 +395,12 @@ sub run_chroot_session {
 
 	$self->set('Build Dir', $session->strip_chroot_path($self->get('Chroot Build Dir')));
 
+	# Run pre build external commands
+	$self->check_abort();
+	$self->run_external_commands("pre-build-commands",
+				     $self->get_conf('LOG_EXTERNAL_COMMAND_OUTPUT'),
+				     $self->get_conf('LOG_EXTERNAL_COMMAND_ERROR'));
+
 	# Log colouring
 	$self->build_log_colour('red', '^E: ');
 	$self->build_log_colour('yellow', '^W: ');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/sbuild.git