disable :any bottles due to Homebrew/homebrew#24780
This commit is contained in:
		
							parent
							
								
									bac8cce29f
								
							
						
					
					
						commit
						9d72738c54
					
				@ -17,7 +17,10 @@ def install_bottle? f, options={:warn=>false}
 | 
				
			|||||||
  return false unless f.pour_bottle?
 | 
					  return false unless f.pour_bottle?
 | 
				
			||||||
  return false unless f.default_build?
 | 
					  return false unless f.default_build?
 | 
				
			||||||
  return false unless bottle_current?(f)
 | 
					  return false unless bottle_current?(f)
 | 
				
			||||||
  if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
 | 
					  # Disable "any", it is broken when relocating via :any
 | 
				
			||||||
 | 
					  # if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
 | 
				
			||||||
 | 
					  # See: https://github.com/mxcl/homebrew/issues/24780
 | 
				
			||||||
 | 
					  if f.bottle.cellar != HOMEBREW_CELLAR.to_s
 | 
				
			||||||
    if options[:warn]
 | 
					    if options[:warn]
 | 
				
			||||||
      opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
 | 
					      opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user