automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: Fix find_file


From: Akim Demaille
Subject: FYI: Fix find_file
Date: Fri, 12 Sep 2003 10:39:44 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.3 (gnu/linux)

Err...  I thought I had already applied this patch...

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
        Reported by Gary Vaughan.
        (&find_file): Walk the @include in forward order.

Index: lib/Automake/FileUtils.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/FileUtils.pm,v
retrieving revision 1.3
diff -u -u -r1.3 FileUtils.pm
--- lib/Automake/FileUtils.pm 9 Sep 2003 12:27:28 -0000 1.3
+++ lib/Automake/FileUtils.pm 12 Sep 2003 08:36:40 -0000
@@ -83,7 +83,7 @@
       return undef;
     }
 
-  foreach my $path (reverse @include)
+  foreach my $path (@include)
     {
       return File::Spec->canonpath (File::Spec->catfile ($path, $filename))
        if -e File::Spec->catfile ($path, $filename)
@@ -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";
     }
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]