summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2016-10-19 20:48:24 +0300
committerDmitry Shachnev <mitya57@gmail.com>2016-10-19 20:48:24 +0300
commitc198a870caf899d862d4facb901636ce77a9844c (patch)
treefed2d0ef8b4c88e144f7e5c04d19485a9c25b14b
parent9ed77e2ac3e34f2761a488b8748f196624af04b9 (diff)
downloadpkg-kde-tools-c198a870caf899d862d4facb901636ce77a9844c.tar.gz
pkgkde-symbolshelper: Do not pass stderr handle to Dpkg::IPC::spawn.
patch(1) does not print to stderr anyway.
-rw-r--r--debian/changelog3
-rw-r--r--perllib/Debian/PkgKde/SymbolsHelper/Patching.pm1
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 38ecd86..6efa2d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
pkg-kde-tools (0.15.24) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * pkgkde-symbolshelper: Do not pass stderr handle to Dpkg::IPC::spawn,
+ to workaround #839905 (patch does not print to stderr anyway).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 19 Oct 2016 20:46:40 +0300
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm b/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm
index c1ccd12..b5ce5a2 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm
@@ -238,7 +238,6 @@ sub apply {
my $pid = spawn(exec => [ "patch", "--posix", "--force", "-r-", "-p0" ],
from_pipe => \$to_patch_process,
to_handle => $outfile,
- error_to_handle => $outfile,
wait_child => 0
);
my $ret = $self->output($to_patch_process, $filename);