[patch] remove strver's leftover from error message in Solution.pm

Started by Anton Voloshinover 4 years ago2 messages
#1Anton Voloshin
a.voloshin@postgrespro.ru
1 attachment(s)

Hello,

in src/tools/msvc/Solution.pm (in the current master) there is a
leftover from the past:

confess "Bad format of version: $self->{strver}\n";

strver has been gone since 8f4fb4c6 in 2019, so I suggest an obvious
one-line fix in the patch attached:

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index a7b8f720b55..fcb43b0ca05 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -176,7 +176,7 @@ sub GenerateFiles
  			if ($package_version !~ /^(\d+)(?:\.(\d+))?/)
  			{
-				confess "Bad format of version: $self->{strver}\n";
+				confess "Bad format of version: $package_version\n";
  			}
  			$majorver = sprintf("%d", $1);
  			$minorver = sprintf("%d", $2 ? $2 : 0);

I think this should be backported to REL_13_STABLE, but not to
REL_12_STABLE and earlier, where strver was still present.

--
Anton Voloshin,
Postgres Professional, The Russian Postgres Company
https://postgrespro.ru

Attachments:

remove-strver.patchtext/x-patch; charset=UTF-8; name=remove-strver.patchDownload
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index a7b8f720b55..fcb43b0ca05 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -176,7 +176,7 @@ sub GenerateFiles
 
 			if ($package_version !~ /^(\d+)(?:\.(\d+))?/)
 			{
-				confess "Bad format of version: $self->{strver}\n";
+				confess "Bad format of version: $package_version\n";
 			}
 			$majorver = sprintf("%d", $1);
 			$minorver = sprintf("%d", $2 ? $2 : 0);
#2Michael Paquier
michael@paquier.xyz
In reply to: Anton Voloshin (#1)
Re: [patch] remove strver's leftover from error message in Solution.pm

On Sat, Jun 26, 2021 at 12:47:50AM +0700, Anton Voloshin wrote:

I think this should be backported to REL_13_STABLE, but not to REL_12_STABLE
and earlier, where strver was still present.

Good catch! I will take care of that.
--
Michael