Skip to content

Commit 4daa0ea

Browse files
committed
check if debase installed (already_installed doesn't work)
1 parent bf7f78e commit 4daa0ea

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ext/mkrf_conf.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
def already_installed(dep)
55
!Gem::DependencyInstaller.new(:domain => :local).find_gems_with_sources(dep).empty? ||
6-
!Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep).empty?
6+
!Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep).empty?
7+
end
8+
9+
def debase_installed
10+
Gem::Specification.find_by_name('debase')
711
end
812

913
unless jruby || rbx
@@ -14,15 +18,17 @@ def already_installed(dep)
1418

1519
begin
1620
Gem::Command.build_args = ARGV
17-
rescue NoMethodError
21+
rescue NoMethodError
1822
end
1923

2024
if RUBY_VERSION < "1.9"
2125
dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
2226
elsif RUBY_VERSION < '2.0'
2327
dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.30.pre15')
24-
else
28+
else
2529
dep = Gem::Dependency.new("debase", '> 0')
30+
31+
return unless debase_installed
2632
end
2733

2834
begin

0 commit comments

Comments
 (0)