From 1b7b47010a73b8ecaebf28ca2ad5a2dbe73ad0d2 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 10 Sep 2014 03:20:47 +0000 Subject: merge revision(s) 44916: [Backport #10043] error.c: Crash Report log * error.c (REPORTBUG_MSG): mention about Crash Report log file on MacOS X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 7 ++++++- test/ruby/test_rubyoptions.rb | 3 ++- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/error.c b/error.c index 5f8b98c1ed..d05b2eb1cf 100644 --- a/error.c +++ b/error.c @@ -41,12 +41,17 @@ extern const char ruby_description[]; -#define REPORTBUG_MSG \ +static const char REPORTBUG_MSG[] = "[NOTE]\n" \ "You may have encountered a bug in the Ruby interpreter" \ " or extension libraries.\n" \ "Bug reports are welcome.\n" \ + "" +#if defined __APPLE__ + "Don't forget to include the above Crash Report log file.\n" +#endif "For details: http://www.ruby-lang.org/bugreport.html\n\n" \ + ; static const char * rb_strerrno(int err) diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index e84002c9c9..63d69b3e8d 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -502,7 +502,8 @@ class TestRubyOptions < Test::Unit::TestCase \[NOTE\]\n You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n Bug\sreports\sare\swelcome.\n - For\sdetails:\shttp:\/\/www.ruby-lang.org/bugreport.html\n + (?:.*\n)? + For\sdetails:\shttp:\/\/.*\.ruby-lang\.org/.*\n \n (?:#{additional}) \z diff --git a/version.h b/version.h index ff4e52aa03..cf869a810c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 560 +#define RUBY_PATCHLEVEL 561 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 -- cgit v1.2.3