Less code in begin block
This commit is contained in:
parent
638363ac8b
commit
fd0ba6904f
@ -510,44 +510,46 @@ class Formula
|
|||||||
mkdir_p(logd)
|
mkdir_p(logd)
|
||||||
|
|
||||||
log = File.open(logfn, "w")
|
log = File.open(logfn, "w")
|
||||||
log.puts Time.now, "", cmd, args, ""
|
begin
|
||||||
log.flush
|
log.puts Time.now, "", cmd, args, ""
|
||||||
|
|
||||||
if verbose
|
|
||||||
rd, wr = IO.pipe
|
|
||||||
begin
|
|
||||||
pid = fork do
|
|
||||||
rd.close
|
|
||||||
log.close
|
|
||||||
exec_cmd(cmd, args, wr, logfn)
|
|
||||||
end
|
|
||||||
wr.close
|
|
||||||
|
|
||||||
while buf = rd.gets
|
|
||||||
log.puts buf
|
|
||||||
puts buf
|
|
||||||
end
|
|
||||||
ensure
|
|
||||||
rd.close unless rd.closed?
|
|
||||||
end
|
|
||||||
else
|
|
||||||
pid = fork { exec_cmd(cmd, args, log, logfn) }
|
|
||||||
end
|
|
||||||
|
|
||||||
Process.wait(pid)
|
|
||||||
|
|
||||||
$stdout.flush
|
|
||||||
|
|
||||||
unless $?.success?
|
|
||||||
log.flush
|
log.flush
|
||||||
Kernel.system "/usr/bin/tail", "-n", "5", logfn unless verbose
|
|
||||||
log.puts
|
if verbose
|
||||||
require 'cmd/config'
|
rd, wr = IO.pipe
|
||||||
Homebrew.dump_build_config(log)
|
begin
|
||||||
raise BuildError.new(self, cmd, args)
|
pid = fork do
|
||||||
|
rd.close
|
||||||
|
log.close
|
||||||
|
exec_cmd(cmd, args, wr, logfn)
|
||||||
|
end
|
||||||
|
wr.close
|
||||||
|
|
||||||
|
while buf = rd.gets
|
||||||
|
log.puts buf
|
||||||
|
puts buf
|
||||||
|
end
|
||||||
|
ensure
|
||||||
|
rd.close unless rd.closed?
|
||||||
|
end
|
||||||
|
else
|
||||||
|
pid = fork { exec_cmd(cmd, args, log, logfn) }
|
||||||
|
end
|
||||||
|
|
||||||
|
Process.wait(pid)
|
||||||
|
|
||||||
|
$stdout.flush
|
||||||
|
|
||||||
|
unless $?.success?
|
||||||
|
log.flush
|
||||||
|
Kernel.system "/usr/bin/tail", "-n", "5", logfn unless verbose
|
||||||
|
log.puts
|
||||||
|
require 'cmd/config'
|
||||||
|
Homebrew.dump_build_config(log)
|
||||||
|
raise BuildError.new(self, cmd, args)
|
||||||
|
end
|
||||||
|
ensure
|
||||||
|
log.close unless log.closed?
|
||||||
end
|
end
|
||||||
ensure
|
|
||||||
log.close if log && !log.closed?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user