projects
/
ruby-vorbistagger.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed reopening of stdout and stderr.
[ruby-vorbistagger.git]
/
rake
/
configuretask.rb
diff --git
a/rake/configuretask.rb
b/rake/configuretask.rb
index d0e0983fe07d092d975657c0e3de83b84e2d019b..1b24f7260fce6ab671088ada7c521d4efe0f6036 100644
(file)
--- a/
rake/configuretask.rb
+++ b/
rake/configuretask.rb
@@
-23,7
+23,6
@@
require "rake/tasklib"
require "rake/clean"
require "yaml"
require "rake/tasklib"
require "rake/clean"
require "yaml"
-require "tempfile"
require "fileutils"
module Rake
require "fileutils"
module Rake
@@
-140,14
+139,13
@@
module Rake
protected
def can_exec_binary?(bin)
fork do
protected
def can_exec_binary?(bin)
fork do
- tf = Tempfile.open("configuretask")
- STDOUT.reopen(tf)
- STDERR.reopen(tf)
+ STDOUT.reopen("/dev/null")
+ STDERR.reopen("/dev/null")
begin
exec(bin)
rescue SystemCallError
begin
exec(bin)
rescue SystemCallError
- exit
0xb00bface
+ exit
255
ensure
tf.close
end
ensure
tf.close
end
@@
-155,7
+153,7
@@
module Rake
Process.wait
Process.wait
- $?.exitstatus !=
0xb00bface
+ $?.exitstatus !=
255
end
end
end
end
@@
-205,14
+203,15
@@
module Rake
def initialize(name, opts = {})
super
def initialize(name, opts = {})
super
- @command = "pkg-config
--silence-errors
"
+ @command = "pkg-config"
end
protected
def lookup_flags(f)
f = :modversion if f == :version
end
protected
def lookup_flags(f)
f = :modversion if f == :version
- tmp = `#{@command} --#{f} #{@name}`.strip.tr("\n", "/")
+ tmp = `#{@command} --silence-errors --#{f} #{@name}`.
+ strip.tr("\n", "/")
$?.exitstatus.zero? ? tmp : nil
end
end
$?.exitstatus.zero? ? tmp : nil
end
end