Remove used options check from install_bottle?
This is now handled by requiring that options are always passed to the installer explicitly.
This commit is contained in:
		
							parent
							
								
									2182ce4d16
								
							
						
					
					
						commit
						4b80d30bab
					
				@ -12,7 +12,6 @@ def install_bottle? f, options={:warn=>false}
 | 
			
		||||
  return true if f.local_bottle_path
 | 
			
		||||
  return true if ARGV.force_bottle?
 | 
			
		||||
  return false unless f.pour_bottle?
 | 
			
		||||
  return false unless f.default_build?
 | 
			
		||||
  return false unless f.bottle
 | 
			
		||||
 | 
			
		||||
  if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
 | 
			
		||||
 | 
			
		||||
@ -80,10 +80,6 @@ class Formula
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def default_build?
 | 
			
		||||
    self.class.build.used_options.empty?
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def determine_build_options
 | 
			
		||||
    build = active_spec.build
 | 
			
		||||
    options.each { |opt, desc| build.add(opt, desc) }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user