From: Akim Demaille <akim@epita.fr>
Date: Fri, 12 Sep 2003 08:37:57 +0000 (+0000)
Subject: * lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
X-Git-Tag: Release-1-7b~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02c8bffe7389114c8fc6c468685f67387e6f220;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index b78e67afa..04332021d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-09  Akim Demaille  <akim@epita.fr>
+
+	* lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
+	Reported by Gary Vaughan.
+	(&find_file): Walk the @include in forward order.
+
 2003-09-09  Akim Demaille  <akim@epita.fr>
 
 	* lib/Automake/FileUtils.pm (&update_file): Be sure not to leave
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 0050120d2..bb8304e99 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -83,7 +83,7 @@ sub find_file ($@)
       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 @@ sub update_file ($$)
 	  print $out $_;
 	}
       $in->close;
-      unlink ($from) || fatal "cannot not remove $from: $!";
+      unlink ($from) || fatal "cannot remove $from: $!";
       return;
     }
 
@@ -154,7 +154,7 @@ sub update_file ($$)
       # 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 @@ sub update_file ($$)
     {
       # 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";
     }
 }