[debhelper-devel] [debhelper] 03/04: D::D::Buildsystem: Preserve the ret val of doit_noerror

[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 95d4393c00bc4b17e115dea95d5fdc6c29cd0b18
Author: Niels Thykier <niels at thykier.net>
Date:   Wed May 20 21:52:31 2015 +0200

    D::D::Buildsystem: Preserve the ret val of doit_noerror
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 7f5819f..03d7e32 100644
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -315,16 +315,17 @@ sub doit_in_sourcedir {
 # top directory. Errors are ignored.
 sub doit_in_sourcedir_noerror {
         my $this=shift;
+        my $ret;
         if ($this->get_sourcedir() ne '.') {
                 my $sourcedir = $this->get_sourcedir();
                 $this->_cd($sourcedir);
-                print_and_doit_noerror(@_);
+                $ret = print_and_doit_noerror(@_);
                 $this->_cd($this->_rel2rel($this->{cwd}, $sourcedir));
         }
         else {
-                print_and_doit_noerror(@_);
+                $ret = print_and_doit_noerror(@_);
         }
-        return 1;
+        return $ret;
 }
 
 # Changes working directory to the build directory (if needed),
@@ -349,16 +350,17 @@ sub doit_in_builddir {
 # top directory. Errors are ignored.
 sub doit_in_builddir_noerror {
         my $this=shift;
+        my $ret;
         if ($this->get_buildpath() ne '.') {
                 my $buildpath = $this->get_buildpath();
                 $this->_cd($buildpath);
-                print_and_doit_noerror(@_);
+                $ret = print_and_doit_noerror(@_);
                 $this->_cd($this->_rel2rel($this->{cwd}, $buildpath));
         }
         else {
-                print_and_doit_noerror(@_);
+                $ret = print_and_doit_noerror(@_);
         }
-        return 1;
+        return $ret;
 }
 
 # In case of out of source tree building, whole build directory

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