[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
More s/die/error/
From: |
Akim Demaille |
Subject: |
More s/die/error/ |
Date: |
02 Sep 2002 09:39:13 +0200 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Honest Recruiter) |
Index: ChangeLog
from Akim Demaille <address@hidden>
* lib/Autom4te/General.pm (&update_file): s/die/error/.
Reported by Raja R. Harinath.
* bin/autoheader.in, bin/autoreconf.in, bin/autoscan.in,
* bin/autoupdate.in: Use error instead of die.
Index: bin/autoheader.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoheader.in,v
retrieving revision 1.121
diff -u -u -r1.121 autoheader.in
--- bin/autoheader.in 1 Sep 2002 11:04:24 -0000 1.121
+++ bin/autoheader.in 2 Sep 2002 07:40:57 -0000
@@ -111,7 +111,7 @@
if (! @ARGV)
{
my $configure_ac = find_configure_ac;
- die "$me: no input file\n"
+ error "no input file"
unless $configure_ac;
push @ARGV, $configure_ac;
}
@@ -176,7 +176,7 @@
local (%verbatim, %symbol);
do "$tmp/traces.pl";
warn "couldn't parse $tmp/traces.pl: $@" if $@;
-die "$me: error: AC_CONFIG_HEADERS not found in $ARGV[0]\n"
+error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"
unless $config_h;
# We template only the first CONFIG_HEADER.
Index: bin/autoreconf.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoreconf.in,v
retrieving revision 1.101
diff -u -u -r1.101 autoreconf.in
--- bin/autoreconf.in 17 Jul 2002 08:30:43 -0000 1.101
+++ bin/autoreconf.in 2 Sep 2002 07:40:57 -0000
@@ -193,10 +193,10 @@
verbose "working in `$directory'";
chdir $directory
- or die "$me: cannot chdir to $directory: $!\n";
+ or error "cannot chdir to $directory: $!";
my $configure_ac = find_configure_ac;
- die "$me: cannot find `configure.ac' in `$directory'\n"
+ error "cannot find `configure.ac' in `$directory'"
unless $configure_ac;
# ---------------------- #
@@ -480,7 +480,7 @@
}
chdir $cwd
- or die "$me: cannot chdir to $cwd: $!\n";
+ or error "cannot chdir to $cwd: $!";
}
Index: bin/autoscan.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoscan.in,v
retrieving revision 1.79
diff -u -u -r1.79 autoscan.in
--- bin/autoscan.in 17 Jul 2002 08:30:43 -0000 1.79
+++ bin/autoscan.in 2 Sep 2002 07:40:58 -0000
@@ -133,7 +133,7 @@
my $srcdir = $ARGV[0] || ".";
verbose "srcdir = $srcdir";
- chdir $srcdir || die "$me: cannot cd to $srcdir: $!\n";
+ chdir $srcdir || error "cannot cd to $srcdir: $!";
}
@@ -164,7 +164,7 @@
if /^\s*$/ || /^\s*\#/;
unless (/^(\S+)\s+(\S.*)$/ || /^(\S+)\s*$/)
{
- die "$me: cannot parse definition in $file:\n$_\n";
+ error "cannot parse definition in $file:\n$_";
}
my $word = $1;
my $macro = $2 || $generic_macro{$kind};
@@ -185,7 +185,7 @@
$table->close;
}
- die "$me: some tables are inconsistent\n"
+ error "some tables are inconsistent"
if !$tables_are_consistent;
}
Index: bin/autoupdate.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoupdate.in,v
retrieving revision 1.38
diff -u -u -r1.38 autoupdate.in
--- bin/autoupdate.in 17 Jul 2002 08:30:43 -0000 1.38
+++ bin/autoupdate.in 2 Sep 2002 07:40:58 -0000
@@ -95,7 +95,7 @@
if (! @ARGV)
{
my $configure_ac = find_configure_ac;
- die "$me: no input file\n"
+ error "no input file"
unless $configure_ac;
push @ARGV, $configure_ac;
}
@@ -173,7 +173,7 @@
# aclocal.m4 -> aclocal
my $set = basename (dirname ($file));
$set = 'aclocal' if $file eq 'aclocal.m4';
- die "$me: unknown set: $set: $_\n"
+ error "unknown set: $set: $_"
unless $set =~ /^(m4sugar|aclocal|autoconf)$/;
if ($domain eq "AC")
{
@@ -193,9 +193,9 @@
# such as `builtin', `changequote' etc. See autoconf/autoconf.m4.
delete $ac_macros{$_}
foreach (@m4_builtins);
- die "$me: no current Autoconf macros found\n"
+ error "no current Autoconf macros found"
unless keys %ac_macros;
- die "$me: no obsolete Autoconf macros found\n"
+ error "no obsolete Autoconf macros found"
unless keys %au_macros;
if ($debug)
@@ -371,9 +371,9 @@
# prepared input -- input, but reenables the quote before each AU macro.
open INPUT_M4, ">$tmp/input.m4"
- or die "$me: cannot open: $!\n";
+ or error "cannot open: $!";
open FILE, "<$file"
- or die "$me: cannot open: $!\n";
+ or error "cannot open: $!";
print INPUT_M4 "$input_m4";
while (<FILE>)
{
@@ -381,9 +381,9 @@
print INPUT_M4;
}
close FILE
- or die "$me: cannot close $file: $!\n";
+ or error "cannot close $file: $!";
close INPUT_M4
- or die "$me: cannot close $tmp/input.m4: $!\n";
+ or error "cannot close $tmp/input.m4: $!";
# Now ask m4 to perform the update.
xsystem ("$m4 --include=$tmp"
Index: lib/Autom4te/General.pm
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/Autom4te/General.pm,v
retrieving revision 1.22
diff -u -u -r1.22 General.pm
--- lib/Autom4te/General.pm 29 Aug 2002 08:03:10 -0000 1.22
+++ lib/Autom4te/General.pm 2 Sep 2002 07:40:59 -0000
@@ -424,7 +424,7 @@
}
$in->close;
unlink ($from)
- or die "cannot not remove $from: $!";
+ or error "cannot not remove $from: $!";
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- More s/die/error/,
Akim Demaille <=