@@ -5775,9 +5775,19 @@ sub find_new_version {
5775
5775
my $exec = shift or die ;
5776
5776
my $url = shift or die ;
5777
5777
5778
+
5779
+ my $version = verify_version();
5780
+
5778
5781
# # The format is X.Y.Z [optional message]
5779
5782
my $versionre = qr { ((\d +)\. (\d +)\. (\d +))\s *(.*)} ;
5780
5783
my ($cversion ,$cmajor ,$cminor ,$crevision ,$cmessage ) = (' ' ,' ' ,' ' ,' ' ,' ' );
5784
+
5785
+ # # If we're running on PG10, then format is X.Y [optional message]
5786
+ if ($version >= 10) {
5787
+ $versionre = qr { ((\d +)\. (\d +))\s *(.*)} ;
5788
+ ($cversion ,$cmajor ,$cminor ,$cmessage ) = (' ' ,' ' ,' ' ,' ' );
5789
+ }
5790
+
5781
5791
my $found = 0;
5782
5792
5783
5793
# # Try to fetch the current version from the web
@@ -5789,9 +5799,17 @@ sub find_new_version {
5789
5799
# # Postgres is slightly different
5790
5800
if ($program eq ' Postgres' ) {
5791
5801
$cmajor = {};
5792
- while ($info =~ / <title>(\d +)\. (\d +)\. (\d +)/g ) {
5793
- $found = 1;
5794
- $cmajor -> {" $1 .$2 " } = $3 ;
5802
+ if ($version >= 10) {
5803
+ while ($info =~ / <title>(\d +)\. (\d +)/g ) {
5804
+ $found = 1;
5805
+ $cmajor -> {" $1 " } = $2 ;
5806
+ }
5807
+ }
5808
+ else {
5809
+ while ($info =~ / <title>(\d +)\. (\d +)\. (\d +)/g ) {
5810
+ $found = 1;
5811
+ $cmajor -> {" $1 .$2 " } = $3 ;
5812
+ }
5795
5813
}
5796
5814
}
5797
5815
elsif ($info =~ $versionre ) {
@@ -5835,7 +5853,13 @@ sub find_new_version {
5835
5853
add_unknown msg(' new-ver-nolver' , $program );
5836
5854
return ;
5837
5855
}
5838
- my ($lversion ,$lmajor ,$lminor ,$lrevision ) = ($1 , int $2 , int $3 , int $4 );
5856
+ my ($lversion ,$lmajor ,$lminor ,$lrevision ) = (' ' ,0,0,0);
5857
+ if ($version >= 10) {
5858
+ ($lversion , $lmajor , $lminor ) = ($1 , int $2 , int $3 );
5859
+ } else {
5860
+ ($lversion ,$lmajor ,$lminor ,$lrevision ) = ($1 , int $2 , int $3 , int $4 );
5861
+ }
5862
+
5839
5863
if ($VERBOSE >= 1) {
5840
5864
$output =~ s /\s +$// s ;
5841
5865
warn " Local version string: $output \n " ;
@@ -5852,7 +5876,11 @@ sub find_new_version {
5852
5876
$crevision = $cmajor -> {$lver };
5853
5877
$cmajor = $lmajor ;
5854
5878
$cminor = $lminor ;
5855
- $cversion = " $cmajor .$cminor .$crevision " ;
5879
+ if ($version >= 10) {
5880
+ $cversion = " $cmajor .$cminor " ;
5881
+ } else {
5882
+ $cversion = " $cmajor .$cminor .$crevision " ;
5883
+ }
5856
5884
}
5857
5885
5858
5886
# # Most common case: everything matches
0 commit comments