From: Anton Voloshin <a.voloshin@postgrespro.ru>
To: pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: [patch] remove strver's leftover from error message in Solution.pm
Date: Sat, 26 Jun 2021 00:47:50 +0700
Message-ID: <af79ee1b-9962-b299-98e1-f90a289e19e6@postgrespro.ru> (raw)
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:
inline patch 1: src/tools/msvc/Solution.pm (+1/-1 lines) download inline-1.patchdiff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pmindex 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.ruPatches and attachments:download all (2 files, .tar.gz)remove-strver.patch (text/x-patch, 468B) downloaddiff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pmindex 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);
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: a.voloshin@postgrespro.ru
Subject: Re: [patch] remove strver's leftover from error message in Solution.pm
In-Reply-To: <af79ee1b-9962-b299-98e1-f90a289e19e6@postgrespro.ru>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox