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

Reply via email to