summaryrefslogtreecommitdiff
path: root/lib/overwrite.rb
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
committerrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
commit8013002d2256a2e86982c2d0ef8358ad30bc9252 (patch)
tree6e25e5d92ca29cd46213d593db14d5538630d5e1 /lib/overwrite.rb
parenta6d1725caa7d350f2526ea82af3478a12a34f93d (diff)
parentfc990e6dae8af7cfdf7d12b4e1d9ccd3b557418a (diff)
Merge branch 'development' of github.com:opentox/opentox-client into development
Diffstat (limited to 'lib/overwrite.rb')
-rw-r--r--lib/overwrite.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/overwrite.rb b/lib/overwrite.rb
index 97c35aa..e3f72ad 100644
--- a/lib/overwrite.rb
+++ b/lib/overwrite.rb
@@ -64,10 +64,8 @@ module Kernel
stdout = stdout_stream.read
stderr = stderr_stream.read
end
- raise stderr.strip if !status.success?
+ internal_server_error stdout + stderr if !status.success?
return stdout
- rescue Exception
- internal_server_error $!
end
alias_method :system!, :system