Skip to content

Commit 12fc83c

Browse files
committed
fix installation issues with prerelease base gem versions
1 parent 474d360 commit 12fc83c

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

ext/mkrf_conf.rb

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,32 @@
22
unless jruby
33
require 'rubygems'
44
require 'rubygems/command.rb'
5+
require 'rubygems/dependency.rb'
56
require 'rubygems/dependency_installer.rb'
67

78
begin
89
Gem::Command.build_args = ARGV
910
rescue NoMethodError
1011
end
1112

12-
inst = Gem::DependencyInstaller.new(:prerelease => true)
13+
if RUBY_VERSION < "1.9"
14+
dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
15+
else
16+
dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.24')
17+
end
18+
19+
inst = Gem::DependencyInstaller.new
1320
begin
14-
if RUBY_VERSION < "1.9"
15-
inst.install "ruby-debug-base", '>=0.10.4'
16-
else
17-
inst.install "ruby-debug-base19x", '>=0.11.24'
18-
end
19-
rescue
21+
inst.install dep
22+
rescue
23+
inst = Gem::DependencyInstaller.new(:prerelease => true)
24+
begin
25+
inst.install dep
26+
rescue Exception => e
27+
puts e
28+
puts e.backtrace.join "\n "
2029
exit(1)
30+
end
2131
end
2232
end
2333

0 commit comments

Comments
 (0)