diff --git a/ChangeLog b/ChangeLog index 8c1e601fc..1b984da71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ Bugs + Fixed bug #1038, which prints blank lines with bulk changes and when the verbose attributes does not specify it. Lines do a better separation between each changes also. + + Fixed bug #1042, where the 'diagnostics' command failed to detect missing + external utilities on Solaris and NetBSD ------ old releases ------------------------------ diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index a0af04048..18564ed2e 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -229,7 +229,7 @@ int CmdDiagnostics::execute (std::string& output) std::vector matches; char buffer [1024] = {0}; FILE* fp; - if ((fp = popen ("scp 2>&1", "r"))) + if ((fp = popen ("/usr/bin/env scp 2>&1", "r"))) { char* p = fgets (buffer, 1023, fp); pclose (fp); @@ -243,7 +243,7 @@ int CmdDiagnostics::execute (std::string& output) << "\n"; } - if ((fp = popen ("rsync --version 2>&1", "r"))) + if ((fp = popen ("/usr/bin/env rsync --version 2>&1", "r"))) { char* p = fgets (buffer, 1023, fp); pclose (fp); @@ -260,7 +260,7 @@ int CmdDiagnostics::execute (std::string& output) } } - if ((fp = popen ("curl --version 2>&1", "r"))) + if ((fp = popen ("/usr/bin/env curl --version 2>&1", "r"))) { char* p = fgets (buffer, 1023, fp); pclose (fp);