[前][次][番号順一覧][スレッド一覧]

ruby-changes:48936

From: nobu <ko1@a...>
Date: Wed, 6 Dec 2017 20:19:00 +0900 (JST)
Subject: [ruby-changes:48936] nobu:r61055 (trunk): file2lastrev.rb: suppress_not_found

nobu	2017-12-06 20:18:53 +0900 (Wed, 06 Dec 2017)

  New Revision: 61055

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61055

  Log:
    file2lastrev.rb: suppress_not_found
    
    * tool/file2lastrev.rb: exit successfully when command not found,
      and if --suppress_not_found is given.

  Modified files:
    trunk/common.mk
    trunk/tool/file2lastrev.rb
Index: common.mk
===================================================================
--- common.mk	(revision 61054)
+++ common.mk	(revision 61055)
@@ -989,7 +989,7 @@ $(srcdir)/revision.h: https://github.com/ruby/ruby/blob/trunk/common.mk#L989
 	@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
Index: tool/file2lastrev.rb
===================================================================
--- tool/file2lastrev.rb	(revision 61054)
+++ tool/file2lastrev.rb	(revision 61055)
@@ -89,7 +89,8 @@ else https://github.com/ruby/ruby/blob/trunk/tool/file2lastrev.rb#L89
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]