projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c8516b7
)
Handle odd logrotate version string
author
Jamie Cameron
<jcameron@webmin.com>
Sat, 19 Jun 2010 20:56:16 +0000
(13:56 -0700)
committer
Jamie Cameron
<jcameron@webmin.com>
Sat, 19 Jun 2010 20:56:16 +0000
(13:56 -0700)
logrotate/logrotate-lib.pl
patch
|
blob
|
history
diff --git
a/logrotate/logrotate-lib.pl
b/logrotate/logrotate-lib.pl
index
e37a8c7
..
cb39483
100755
(executable)
--- a/
logrotate/logrotate-lib.pl
+++ b/
logrotate/logrotate-lib.pl
@@
-174,7
+174,8
@@
sub get_logrotate_version
{
local $out = &backquote_command("$config{'logrotate'} -v 2>&1", 1);
${$_[0]} = $out if ($_[0]);
-return $out =~ /logrotate\s+([0-9\.]+)\s/ ? $1 : undef;
+return $out =~ /logrotate\s+([0-9\.]+)\s/ ||
+ $out =~ /logrotate\-([0-9\.]+)\s/ ? $1 : undef;
}
# get_period(&conf)