From: Joey Hess Date: Thu, 18 Feb 2010 21:37:31 +0000 (-0500) Subject: The fix for #563557 caused some new trouble involving makefile that misbehave when... X-Git-Tag: 7.4.15~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54804a1d1d330665cd8745a78a3953ce84fa1326;p=debhelper.git The fix for #563557 caused some new trouble involving makefile that misbehave when stderr is closed. Reopen it to /dev/null when testing for the existance of a makefile target. Closes: #570443 --- diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index 2c14c15..e106ffd 100644 --- a/Debian/Debhelper/Buildsystem/makefile.pm +++ b/Debian/Debhelper/Buildsystem/makefile.pm @@ -19,7 +19,7 @@ sub exists_make_target { my $buildpath = $this->get_buildpath(); unshift @opts, "-C", $buildpath if $buildpath ne "."; open(SAVEDERR, ">&STDERR"); - close STDERR; + open(STDERR, ">/dev/null"); open(MAKE, "-|", $this->{makecmd}, @opts, $target); my $output=; close MAKE; diff --git a/debian/changelog b/debian/changelog index 77f1844..342f61a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (7.4.15) UNRELEASED; urgency=low + + * The fix for #563557 caused some new trouble involving makefile + that misbehave when stderr is closed. Reopen it to /dev/null + when testing for the existance of a makefile target. Closes: #570443 + + -- Joey Hess Thu, 18 Feb 2010 16:36:18 -0500 + debhelper (7.4.14) unstable; urgency=low * dh: Disable option bundling to avoid mis-parsing bundled options such