Re: Reverting 50-gary-work-around-cvs-autoreconf-aclocal-m4t-bug.patch[WAS Re: FYI: 50-gary-work-around-cvs-autoreconf-aclocal-m4t-bug.patch]

[Akim Demaille]

Gary V. Vaughan a dit:

> Reverted in m4 HEAD.
>
> Akim Demaille wrote:
>> +        or fatal "cannot not remove $from: $!";
>
> or fatal "can not remove $from: $!";
>
> A quick scan of just this file shows a couple of similar double negatives
> in
> messages...

Doh!

Thanks, I'm installing this in Autoconf and Automake.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * lib/Autom4te/FileUtils.pm (&update_file): s/cannot not/cannot/g.
        Reported by Gary Vaughan.
        * bin/autom4te.in (handle_m4): Likewise.

Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.90
diff -u -u -r1.90 autom4te.in
--- bin/autom4te.in     4 Sep 2003 13:01:12 -0000       1.90
+++ bin/autom4te.in     9 Sep 2003 15:44:11 -0000
@@ -472,7 +472,7 @@
     {
       use File::Copy;
       move ("${file}t", "$file")
-       or fatal "cannot not rename ${file}t as $file: $!";
+       or fatal "cannot rename ${file}t as $file: $!";
     }
 }

Index: lib/Autom4te/FileUtils.pm
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/Autom4te/FileUtils.pm,v
retrieving revision 1.4
diff -u -u -r1.4 FileUtils.pm
--- lib/Autom4te/FileUtils.pm   9 Sep 2003 12:28:19 -0000       1.4
+++ lib/Autom4te/FileUtils.pm   9 Sep 2003 15:44:11 -0000
@@ -145,7 +145,7 @@
          print $out $_;
        }
       $in->close;
-      unlink ($from) || fatal "cannot not remove $from: $!";
+      unlink ($from) || fatal "cannot remove $from: $!";
       return;
     }

@@ -154,7 +154,7 @@
       # File didn't change, so don't update its mod time.
       msg 'note', "`$to' is unchanged";
       unlink ($from)
-        or fatal "cannot not remove $from: $!";
+        or fatal "cannot remove $from: $!";
       return
     }

@@ -162,15 +162,15 @@
     {
       # Back up and install the new one.
       move ("$to",  "$to$SIMPLE_BACKUP_SUFFIX")
-       or fatal "cannot not backup $to: $!";
+       or fatal "cannot backup $to: $!";
       move ("$from", "$to")
-       or fatal "cannot not rename $from as $to: $!";
+       or fatal "cannot rename $from as $to: $!";
       msg 'note', "`$to' is updated";
     }
   else
     {
       move ("$from", "$to")
-       or fatal "cannot not rename $from as $to: $!";
+       or fatal "cannot rename $from as $to: $!";
       msg 'note', "`$to' is created";
     }
 }