[ooo-build-commit] .: patches/apply.pl.in

[Thomas Klausner]

 patches/apply.pl.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f32f7a4d426946e00b0518f712d52ede870b6ea
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sat Oct 2 16:43:42 2010 +0200

    When detecting patch's version, redirect stderr to stdout.
    
    This is needed on NetBSD, where patch(1) currently reports its
    version to stderr.

diff --git a/patches/apply.pl.in b/patches/apply.pl.in
index 9b7055e..b08bb0c 100755
--- a/patches/apply.pl.in
+++ b/patches/apply.pl.in
@@ -919,7 +919,7 @@ sub is_old_patch_version()
     my $ver_line;
     my $is_old = 1;
 
-    open ($Patch, "@GNUPATCH@ --version|") || die "Can't run patch: $!";
+    open ($Patch, "@GNUPATCH@ --version 2>&1|") || die "Can't run patch: $!";
     $ver_line = <$Patch>;
     $ver_line =~ m/\s+(\d+)\.(\d+)\.?(\d+)?/ || die "Can't get patch version\n";
     if ( ( $1 > 2 ) ||