file2lastrev.rb: try to overwrite the found revision.h as before

2 files changed, 9 insertions, 6 deletions

diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index a2b639a426..48b8a1ae99 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -90,7 +90,7 @@ formatter =
 ok = true
 (ARGV.empty? ? [nil] : ARGV).each do |arg|
   begin
-    @output.write(formatter[*vcs.get_revisions(arg)]+"\n")
+    @output.write(formatter[*vcs.get_revisions(arg)]+"\n", overwrite: true)
   rescue => e
     warn "#{File.basename(Program)}: #{e.message}"
     ok = false
diff --git a/tool/lib/output.rb b/tool/lib/output.rb
index 584be76974..cbaa4b5a3e 100644
--- a/tool/lib/output.rb
+++ b/tool/lib/output.rb
@@ -18,7 +18,7 @@ class Output
     @vpath.def_options(opt)
   end
 
-  def write(data)
+  def write(data, overwrite: false)
     unless @path
       $stdout.print data
       return true
@@ -26,13 +26,16 @@ class Output
     color = Colorize.new(@color)
     unchanged = color.pass("unchanged")
     updated = color.fail("updated")
+    outpath = nil
 
-    if @ifchange and (@vpath.read(@path, "rb") == data rescue false)
-      puts "#{@path} #{unchanged}"
+    if @ifchange and (@vpath.open(@path, "rb") {|f| outpath = f.path; f.read == data} rescue false)
+      puts "#{outpath} #{unchanged}"
       written = false
     else
-      File.binwrite(@path, data)
-      puts "#{@path} #{updated}"
+      unless overwrite and outpath and (File.binwrite(outpath, data) rescue nil)
+        File.binwrite(outpath = @path, data)
+      end
+      puts "#{outpath} #{updated}"
       written = true
     end
     if timestamp = @timestamp