Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwpvr-0003eH-SY for pgsql-hackers@arkaria.postgresql.org; Fri, 25 Jun 2021 17:48:00 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lwpvo-0005Rh-R9 for pgsql-hackers@arkaria.postgresql.org; Fri, 25 Jun 2021 17:47:56 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwpvo-0005RY-HZ for pgsql-hackers@lists.postgresql.org; Fri, 25 Jun 2021 17:47:56 +0000 Received: from mail.postgrespro.ru ([93.174.131.139]) by magus.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lwpvl-0004lS-P5 for pgsql-hackers@postgresql.org; Fri, 25 Jun 2021 17:47:55 +0000 Received: from [192.168.0.11] (unknown [94.78.224.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mail.postgrespro.ru (Postfix) with ESMTPSA id 198CA21CA6CF for ; Fri, 25 Jun 2021 20:47:52 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=postgrespro.ru; s=mail; t=1624643272; bh=bUyoNCc8u9+UMxAdJAQ1/y1d4ZutFocd7BRjb+8nHPE=; h=To:From:Subject:Date; b=deUe8GvjaYzAON3SNq2uphmAIw5sNJN5PaYaFHXj88XXHv6TImf1J28AuuKhER9+N g8A8+zh2cAPLQWdE64w4BjxA6G2jh4KDCiK/Fa9vsuL8fANYOtR08AfGx4FXzmqBP6 B6TUo0gu060PJicIUALUvmb8dKIQqfviiT563w54= To: pgsql-hackers From: Anton Voloshin Subject: [patch] remove strver's leftover from error message in Solution.pm Message-ID: Date: Sat, 26 Jun 2021 00:47:50 +0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D636CB3BDAF071EB07980A45" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------D636CB3BDAF071EB07980A45 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit 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 --------------D636CB3BDAF071EB07980A45 Content-Type: text/x-patch; charset=UTF-8; name="remove-strver.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="remove-strver.patch" 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); --------------D636CB3BDAF071EB07980A45--