diff --git a/common.mk b/common.mk index f6119f9510..2c9f705ce2 100644 --- a/common.mk +++ b/common.mk @@ -989,7 +989,7 @@ $(srcdir)/revision.h: @exit > $@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE) - -$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp + $(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp $(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp $(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb index ee615a5060..8d68da9f88 100755 --- a/tool/file2lastrev.rb +++ b/tool/file2lastrev.rb @@ -89,7 +89,8 @@ else begin puts @output[*vcs.get_revisions(arg)] rescue => e - warn "#{File.basename(Program)}: #{e.message}" unless @suppress_not_found + next if @suppress_not_found and VCS::NotFoundError === e + warn "#{File.basename(Program)}: #{e.message}" ok = false end end