database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

pgindent: improve error messages

Browse Source 
per suggestion from Gurjeet Singh
This commit is contained in:
Bruce Momjian
2013-04-12 15:25:33 -04:00
parent 8daa4e960e
commit 5003f94f66
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/tools/pgindent/pgindent
View File

@ -30,7 +30,7 @@ my %options = (
"excludes=s" => \$excludes, "excludes=s" => \$excludes,
"indent=s" => \$indent, "indent=s" => \$indent,
"build" => \$build,); "build" => \$build,);
GetOptions(%options) || die "bad command line"; GetOptions(%options) || die "bad command line argument";
run_build($code_base) if ($build); run_build($code_base) if ($build);
@ -118,10 +118,11 @@ sub load_typedefs
if (-f "$tdtry/src/tools/pgindent/typedefs.list"); if (-f "$tdtry/src/tools/pgindent/typedefs.list");
$tdtry = "$tdtry/.."; $tdtry = "$tdtry/..";
} }
die "no typedefs file" unless $typedefs_file && -f $typedefs_file; die "cannot locate typedefs file \"$typedefs_file\""
unless $typedefs_file && -f $typedefs_file;
open(my $typedefs_fh, '<', $typedefs_file) open(my $typedefs_fh, '<', $typedefs_file)
|| die "opening $typedefs_file: $!"; || die "cannot open typedefs file \"$typedefs_file\": $!";
my @typedefs = <$typedefs_fh>; my @typedefs = <$typedefs_fh>;
close($typedefs_fh); close($typedefs_fh);
@ -143,7 +144,7 @@ sub process_exclude
{ {
if ($excludes && @files) if ($excludes && @files)
{ {
open(my $eh, '<', $excludes) || die "opening $excludes"; open(my $eh, '<', $excludes) || die "cannot open exclude file \"$excludes\"";
while (my $line = <$eh>) while (my $line = <$eh>)
{ {
chomp $line; chomp $line;
@ -162,7 +163,7 @@ sub read_source
my $source; my $source;
open(my $src_fd, '<', $source_filename) open(my $src_fd, '<', $source_filename)
|| die "opening $source_filename: $!"; || die "cannot open file \"$source_filename\": $!";
local ($/) = undef; local ($/) = undef;
$source = <$src_fd>; $source = <$src_fd>;
close($src_fd); close($src_fd);
@ -177,7 +178,7 @@ sub write_source
my $source_filename = shift; my $source_filename = shift;
open(my $src_fh, '>', $source_filename) open(my $src_fh, '>', $source_filename)
|| die "opening $source_filename: $!"; || die "cannot open file \"$source_filename\": $!";
print $src_fh $source; print $src_fh $source;
close($src_fh); close($src_fh);
} }
@ -436,25 +437,25 @@ sub run_build
$code_base = "$code_base/.."; $code_base = "$code_base/..";
} }
die "no src/tools/pgindent directory in $code_base" die "cannot locate src/tools/pgindent directory in \"$code_base\""
unless -d "$code_base/src/tools/pgindent"; unless -d "$code_base/src/tools/pgindent";
chdir "$code_base/src/tools/pgindent"; chdir "$code_base/src/tools/pgindent";
my $rv = getstore("http://buildfarm.postgresql.org/cgi-bin/typedefs.pl", my $typedefs_list_url = "http://buildfarm.postgresql.org/cgi-bin/typedefs.pl";
"tmp_typedefs.list");
die "fetching typedefs.list" unless is_success($rv); my $rv = getstore($typedefs_list_url, "tmp_typedefs.list");
die "cannot fetch typedefs list from $typedefs_list_url" unless is_success($rv);
$ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list'); $ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list');
my $pg_bsd_indent_name = "pg_bsd_indent-" . $INDENT_VERSION . ".tar.gz"; my $pg_bsd_indent_url = "ftp://ftp.postgresql.org/pub/dev/pg_bsd_indent-" .
$INDENT_VERSION . ".tar.gz";
$rv = $rv = getstore($pg_bsd_indent_url, "pg_bsd_indent.tgz");
getstore("ftp://ftp.postgresql.org/pub/dev/$pg_bsd_indent_name",
"pg_bsd_indent.tgz");
die "fetching $pg_bsd_indent_name" unless is_success($rv); die "cannot fetch BSD indent tarfile from $pg_bsd_indent_url" unless is_success($rv);
# XXX add error checking here # XXX add error checking here
@ -484,7 +485,7 @@ sub build_clean
$code_base = "$code_base/.."; $code_base = "$code_base/..";
} }
die "no src/tools/pgindent directory in $code_base" die "cannot locate src/tools/pgindent directory in \"$code_base\""
unless -d "$code_base/src/tools/pgindent"; unless -d "$code_base/src/tools/pgindent";
chdir "$code_base"; chdir "$code_base";