summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2015-05-20 21:52:31 +0200
committerNiels Thykier <niels@thykier.net>2015-05-20 21:52:31 +0200
commit95d4393c00bc4b17e115dea95d5fdc6c29cd0b18 (patch)
tree6cbf3924631ec6f9e6117403898464093a082d8a /Debian
parentf581e5d4ea5ca7b22fdb9edc8b0aa77093ee60d4 (diff)
downloaddebhelper-95d4393c00bc4b17e115dea95d5fdc6c29cd0b18.tar.gz
D::D::Buildsystem: Preserve the ret val of doit_noerror
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Buildsystem.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 7f5819fd..03d7e320 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