diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-06 10:12:12 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-06 10:12:12 +0000 |
| commit | f2ba46eefaacbd786e0cd4bff8ed904008c15291 (patch) | |
| tree | e8e6f9b4257a9812c4abb589d23456c4a9cceb98 /lib | |
| parent | 121de31d0331bd5310aad3d89cc0ad3883273d69 (diff) | |
Merge changes from ruby_1_8:
* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
Digest::MD5.
* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
* lib/shell/process-controller.rb: fix thread synchronization
problem for [ruby-dev:30477].
* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
moriq.com> in [ruby-dev:30500].
* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
* time.c (time_to_s): Back out the format changes; discussed
in [ruby-dev:30495].
* ext/tk/sample/irbtkw.rbw: fails to exit process.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/shell/process-controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb index f74abfd686..8929805506 100644 --- a/lib/shell/process-controller.rb +++ b/lib/shell/process-controller.rb @@ -246,9 +246,11 @@ class Shell redo end Thread.exclusive do - terminate_job(command) - @job_condition.signal - command.notify "job(%id) finish.", @shell.debug? + @job_monitor.synchronize do + terminate_job(command) + @job_condition.signal + command.notify "job(%id) finish.", @shell.debug? + end end end } |