From 66ac2ba10f7fd1be107eeeb299fffc36e8cb0397 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Mon, 31 Aug 2020 16:06:22 +0300 Subject: [PATCH] Fix false positive error outputs https://forum.virtualmin.com/t/force-logrotate-fails/107301 --- logrotate/force.cgi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/logrotate/force.cgi b/logrotate/force.cgi index 261603344..1717ab8f8 100755 --- a/logrotate/force.cgi +++ b/logrotate/force.cgi @@ -12,8 +12,13 @@ print $text{'force_doing'},"\n"; &clean_environment(); $out = &backquote_logged("$config{'logrotate'} -f $config{'logrotate_conf'} 2>&1"); &reset_environment(); -print "
$out
"; -if ($?) { +if ($out) { + print "
$out
"; + } +else { + print "
"; + } +if ($? && $out) { print $text{'force_failed'},"
\n"; } else {