[debhelper-devel] [debhelper] 01/01: Don't swallow $@ when configure() fails, for accurate error reporting.

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 518eaa3c4e8d6150c986570aaacc0cb2b4df5c6a
Author: Jonathan Hall <flimzy at flimzy.com>
Date:   Sun Oct 25 20:01:00 2015 +0100

    Don't swallow $@ when configure() fails, for accurate error reporting.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 4 ++--
 debian/changelog                      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 6bd591b..f4d5c3c 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -86,11 +86,11 @@ sub configure {
 	eval { 
 		$this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags, @_);
 	};
-	if ($@) {
+	if (my $err = $@) {
 		if (-e $this->get_buildpath("CMakeCache.txt")) {
 			$this->doit_in_builddir("tail -v -n +0 CMakeCache.txt");
 		}
-		die $@;
+		die $err;
 	}
 }
 
diff --git a/debian/changelog b/debian/changelog
index e2f6dae..a9effec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ debhelper (9.20151005) unstable; urgency=medium
   * dh_installinit: The postinst snippets are now only run
     during "configure" or "abort-upgrade".
     (Closes: #188028)
+  * cmake.pm: Apply patch from Jonathan Hall to fix an
+    accidental error hiding.  (Closes: #802984)
 
   [ Translations ]
   * Update German translation (Chris Leick)

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