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

tglsfdc · tglsfdc · commit 87ac6e72cc09 · 2010-01-06T22:02:45.000Z
Per Stefan.
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
@@ -10,7 +10,7 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # 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 @@
     {
         push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
     }
-    elsif ($arg =~ /^--set-version=(\d+\.\d+)$/)
+    elsif ($arg =~ /^--set-version=(.*)$/)
     {
         $major_version = $1;
+	die "Version must be in format nn.nn.\n"
+	    if !($major_version =~ /^\d+\.\d+$/);
     }
     else
     {
@@ -53,7 +55,7 @@
 # Sanity check arguments.
 die "No input files.\n" if !@input_files;
 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.
 if ($output_path ne '' && substr($output_path, -1) ne '/')

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