Re: [HACKERS] snapshot generation broken again...
Stefan Kaltenbrunner ste...@kaltenbrunner.cc writes: Looks like somebody broke the snapshot generation script again: [ scratches head... ] make dist works for me. Can you get a trace indicating what command was used to call genbki.pl? regards, tom lane -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
Tom Lane wrote: Stefan Kaltenbrunner ste...@kaltenbrunner.cc writes: Looks like somebody broke the snapshot generation script again: [ scratches head... ] make dist works for me. Can you get a trace indicating what command was used to call genbki.pl? heh that's a nice one the snapshot generation script uses gmake -s VERSION=snapshot dist and that leads to getting --set-version=snapshot passed to genbki.pl which fails the regex there and the if() falls through to the usage(). Stefan -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
Here's a fix. Sorry, I didn't realize it was ever called without a
version number.
On Wed, Jan 6, 2010 at 11:18 AM, Stefan Kaltenbrunner
heh that's a nice one the snapshot generation script uses
gmake -s VERSION=snapshot dist and that leads to getting
--set-version=snapshot passed to genbki.pl which fails the regex there and
the if() falls through to the usage().
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index edd3aee..94c2d45 100644
*** a/src/backend/catalog/genbki.pl
--- b/src/backend/catalog/genbki.pl
*** while (@ARGV)
*** 40,48
{
push @include_path, length($arg) 2 ? substr($arg, 2) : shift @ARGV;
}
! elsif ($arg =~ /^--set-version=(\d+\.\d+).*$/)
{
$major_version = $1;
}
else
{
--- 40,52
{
push @include_path, length($arg) 2 ? substr($arg, 2) : shift @ARGV;
}
! elsif ($arg =~ /^--set-version=(.*)$/)
{
$major_version = $1;
+ # Extract version information, if any.
+ if ($major_version =~ /^(\d+.\d+)/) {
+ $major_version = $1;
+ }
}
else
{
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
Stefan Kaltenbrunner ste...@kaltenbrunner.cc writes: Tom Lane wrote: [ scratches head... ] make dist works for me. Can you get a trace indicating what command was used to call genbki.pl? heh that's a nice one the snapshot generation script uses gmake -s VERSION=snapshot dist and that leads to getting --set-version=snapshot passed to genbki.pl which fails the regex there and the if() falls through to the usage(). Huh ... that doesn't make any sense, because the previous shell-script version also spits up on non-numeric VERSION. How did it work before? [... thinks ...] Oh: it didn't, because we didn't use to try to call this during distprep. We'd not want snapshot as the version number in postgres.bki anyway. So we need to change the makefile to not rely on VERSION for this, I guess. Will fix. regards, tom lane -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
John Naylor jcnay...@gmail.com writes: Here's a fix. Sorry, I didn't realize it was ever called without a version number. It's not supposed to be. If it fails to put the correct version number into the .bki file, initdb will spit up. This is really a makefile bug, not genbki's fault. regards, tom lane -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
Tom Lane wrote: John Naylor jcnay...@gmail.com writes: Here's a fix. Sorry, I didn't realize it was ever called without a version number. It's not supposed to be. If it fails to put the correct version number into the .bki file, initdb will spit up. This is really a makefile bug, not genbki's fault. really? there are provisions withing genbki.pl that are supposed to provide a proper error message(and would have likely helped to find the issue in that case as well): die Version not specified or wrong format.\n if !defined $major_version; however due to the way the current checks are executed you won't actually see that error... Stefan -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
Re: [HACKERS] snapshot generation broken again...
Stefan Kaltenbrunner ste...@kaltenbrunner.cc writes: really? there are provisions withing genbki.pl that are supposed to provide a proper error message(and would have likely helped to find the issue in that case as well): die Version not specified or wrong format.\n if !defined $major_version; however due to the way the current checks are executed you won't actually see that error... Good point, the way that the error checking is done in the script leaves a lot to be desired there. regards, tom lane -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
