mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/vcs.rb (IO.popen): Enable on Ruby 1.9 where chdir option is not
supported on IO.popen * tool/vcs.rb (IO.popen): Fix NoMethodError. I guess r49705 was not tested... :/ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
43b2144254
commit
53a606a549
2 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
Thu Dec 24 14:44:08 2015 sorah (Shota Fukumori) <her@sorah.jp>
|
||||
|
||||
* tool/vcs.rb (IO.popen): Enable on Ruby 1.9 where chdir option is not
|
||||
supported on IO.popen
|
||||
|
||||
* tool/vcs.rb (IO.popen): Fix NoMethodError. I guess r49705 was not
|
||||
tested... :/
|
||||
|
||||
Thu Dec 24 14:57:03 2015 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* NEWS: rename
|
||||
|
|
|
@ -15,7 +15,7 @@ def IO.pread(*args)
|
|||
popen(*args) {|f|f.read}
|
||||
end
|
||||
|
||||
if RUBY_VERSION < "1.9"
|
||||
if RUBY_VERSION < "2.0"
|
||||
class IO
|
||||
@orig_popen = method(:popen)
|
||||
|
||||
|
@ -23,7 +23,7 @@ if RUBY_VERSION < "1.9"
|
|||
def self.popen(command, *rest, &block)
|
||||
if Hash === (opts = rest[-1])
|
||||
dir = opts.delete(:chdir)
|
||||
rest pop if opts.empty?
|
||||
rest.pop if opts.empty?
|
||||
end
|
||||
if block
|
||||
@orig_popen.call("-", *rest) do |f|
|
||||
|
@ -48,7 +48,7 @@ if RUBY_VERSION < "1.9"
|
|||
def self.popen(command, *rest, &block)
|
||||
if Hash === (opts = rest[-1])
|
||||
dir = opts.delete(:chdir)
|
||||
rest pop if opts.empty?
|
||||
rest.pop if opts.empty?
|
||||
end
|
||||
command = command.shelljoin if Array === command
|
||||
Dir.chdir(dir || ".") do
|
||||
|
|
Loading…
Add table
Reference in a new issue