ruby-changes:5801
From: shyouhei <ko1@a...>
Date: Sun, 15 Jun 2008 23:08:21 +0900 (JST)
Subject: [ruby-changes:5801] Ruby:r17307 (ruby_1_8_6): merge revision(s) 16471:
shyouhei 2008-06-15 23:07:58 +0900 (Sun, 15 Jun 2008) New Revision: 17307 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/process.c branches/ruby_1_8_6/version.h Log: merge revision(s) 16471: * process.c (rb_f_system): set last_status when status == -1 because there is no path to set it on win32. this patch is derived from [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com> http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17307&r2=17306&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17307&r2=17306&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/process.c?r1=17307&r2=17306&diff_format=u Index: ruby_1_8_6/process.c =================================================================== --- ruby_1_8_6/process.c (revision 17306) +++ ruby_1_8_6/process.c (revision 17307) @@ -1525,6 +1525,9 @@ } #if !defined(_WIN32) last_status_set(status == -1 ? 127 : status, 0); +#else + if (status == -1) + last_status_set(0x7f << 8, 0); #endif #elif defined(__VMS) VALUE cmd; Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 17306) +++ ruby_1_8_6/ChangeLog (revision 17307) @@ -1,3 +1,9 @@ +Sun Jun 15 23:07:46 2008 NAKAMURA Usaku <usa@r...> + + * process.c (rb_f_system): set last_status when status == -1 because + there is no path to set it on win32. this patch is derived from + [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com> + Sun Jun 15 23:02:12 2008 GOTOU Yuuzou <gotoyuzo@n...> * lib/webrick/httpservlet/filehandler.rb: should normalize path Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 17306) +++ ruby_1_8_6/version.h (revision 17307) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 210 +#define RUBY_PATCHLEVEL 211 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/