Fix a few regexes which were unexpectedly tested against 7.x versions (eep!)

David Christensen · David Christensen · commit e826c57c910c · 2017-11-28T14:59:25.000-06:00
diff --git a/check_postgres.pl b/check_postgres.pl
@@ -2728,7 +2728,7 @@ sub run_command {
                 if ($db->{error}) {
                     ndie $db->{error};
                 }
-                if ($db->{slurp} !~ /([8-9]\.\d+|1\d+)/) {
+                if ($db->{slurp} !~ /([789]\.\d+|1\d+)/) {
                     ndie msg('die-badversion', $db->{slurp});
                 }
                 $db->{version} = $1;
@@ -8345,7 +8345,7 @@ sub check_version {
 
     my ($warning, $critical) = validate_range({type => 'version', forcemrtg => 1});
 
-    my ($warnfull, $critfull) = (($warning =~ /^(?:1\d+|[8-9]\.\d+)$/ ? 0 : 1),($critical =~ /^(?:1\d+|[8-9]\.\d+)$/ ? 0 : 1));
+    my ($warnfull, $critfull) = (($warning =~ /^(?:1\d+|[789]\.\d+)$/ ? 0 : 1),($critical =~ /^(?:1\d+|[789]\.\d+)$/ ? 0 : 1));
 
     my $info = run_command('SELECT version() AS version');
 

Original file line number	Diff line number	Diff line change
`@@ -2728,7 +2728,7 @@ sub run_command {`
`2728`	`2728`	`if ($db->{error}) {`
`2729`	`2729`	`ndie $db->{error};`
`2730`	`2730`	`}`
`2731`		`- if ($db->{slurp} !~ /([8-9]\.\d+\|1\d+)/) {`
	`2731`	`+ if ($db->{slurp} !~ /([789]\.\d+\|1\d+)/) {`
`2732`	`2732`	`ndie msg('die-badversion', $db->{slurp});`
`2733`	`2733`	`}`
`2734`	`2734`	`$db->{version} = $1;`
`@@ -8345,7 +8345,7 @@ sub check_version {`
`8345`	`8345`
`8346`	`8346`	`my ($warning, $critical) = validate_range({type => 'version', forcemrtg => 1});`
`8347`	`8347`
`8348`		`- my ($warnfull, $critfull) = (($warning =~ /^(?:1\d+\|[8-9]\.\d+)$/ ? 0 : 1),($critical =~ /^(?:1\d+\|[8-9]\.\d+)$/ ? 0 : 1));`
	`8348`	`+ my ($warnfull, $critfull) = (($warning =~ /^(?:1\d+\|[789]\.\d+)$/ ? 0 : 1),($critical =~ /^(?:1\d+\|[789]\.\d+)$/ ? 0 : 1));`
`8349`	`8349`
`8350`	`8350`	`my $info = run_command('SELECT version() AS version');`
`8351`	`8351`