rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make error messages for bad --set-version argument more useful. 

Per Stefan.
This commit is contained in:
Tom Lane 2010-01-06 22:02:45 +00:00
parent d7085f2406
commit 87ac6e72cc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/catalog/genbki.pl
View File

@ -10,7 +10,7 @@
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.5 2010/01/06 19:56:29 tgl Exp $ # $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.6 2010/01/06 22:02:45 tgl Exp $
# #
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -40,9 +40,11 @@ while (@ARGV)
{ {
push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV; push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
} }
elsif ($arg =~ /^--set-version=(\d+\.\d+)$/) elsif ($arg =~ /^--set-version=(.*)$/)
{ {
$major_version = $1; $major_version = $1;
die "Version must be in format nn.nn.\n"
if !($major_version =~ /^\d+\.\d+$/);
} }
else else
{ {
@ -53,7 +55,7 @@ while (@ARGV)
# Sanity check arguments. # Sanity check arguments.
die "No input files.\n" if !@input_files; die "No input files.\n" if !@input_files;
die "No include path; you must specify -I at least once.\n" if !@include_path; die "No include path; you must specify -I at least once.\n" if !@include_path;
die "Version not specified or wrong format.\n" if !defined $major_version; die "--set-version must be specified.\n" if !defined $major_version;
# Make sure output_path ends in a slash. # Make sure output_path ends in a slash.
if ($output_path ne '' && substr($output_path, -1) ne '/') if ($output_path ne '' && substr($output_path, -1) ne '/')