From f74bed4355574d9dc5a8b64d08c70afbdeebc5a8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 22 Oct 2010 08:23:37 -0400
Subject: [PATCH] Diagnostics

- Redirected STDERR into STDOUT to eliminate stray output.
---
 src/diag.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/diag.cpp b/src/diag.cpp
index ab9bf9329..35f6765ee 100644
--- a/src/diag.cpp
+++ b/src/diag.cpp
@@ -211,7 +211,7 @@ void handleDiagnostics (std::string& outs)
                 << "\n";
     }
 
-    if ((fp = popen ("rsync --version", "r")))
+    if ((fp = popen ("rsync --version 2>&1", "r")))
     {
       fgets (buffer, 1023, fp);
       pclose (fp);
@@ -224,7 +224,7 @@ void handleDiagnostics (std::string& outs)
                 << "\n";
     }
 
-    if ((fp = popen ("curl --version", "r")))
+    if ((fp = popen ("curl --version 2>&1", "r")))
     {
       fgets (buffer, 1023, fp);
       pclose (fp);