Handle missing comma
authorJamie Cameron <jcameron@webmin.com>
Sun, 11 Oct 2009 16:38:24 +0000 (09:38 -0700)
committerJamie Cameron <jcameron@webmin.com>
Sun, 11 Oct 2009 16:38:24 +0000 (09:38 -0700)
proc/proc-lib.pl

index afd0b22..c7da981 100755 (executable)
@@ -618,11 +618,11 @@ else {
 sub get_system_uptime
 {
 my $out = &backquote_command("LC_ALL='' LANG='' uptime");
-if ($out =~ /up\s+(\d+)\s+(day|days),\s+(\d+):(\d+)/) {
+if ($out =~ /up\s+(\d+)\s+(day|days),?\s+(\d+):(\d+)/) {
        # up 198 days,  2:06
        return ( $1, $3, $4 );
        }
-elsif ($out =~ /up\s+(\d+)\s+(day|days),\s+(\d+)\s+min/) {
+elsif ($out =~ /up\s+(\d+)\s+(day|days),?\s+(\d+)\s+min/) {
        # up 198 days,  10 mins
        return ( $1, 0, $3 );
        }