summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-24 06:35:04 (GMT)
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-24 06:35:04 (GMT)
commit53a606a549850ce52384955fcd3a4eaa98d2d919 (patch)
treecab4d5030382ac3ac0509606fe4aea3fd8d37c04 /tool
parent43b2144254a6cdc2e583e1041ba6eb9b42c9efaa (diff)
* 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
Diffstat (limited to 'tool')
-rw-r--r--tool/vcs.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb
index e38d1cf..92ae46f 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -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