install, update: AlreadyTappedError never raised.
This commit is contained in:
		
							parent
							
								
									95e6a634b4
								
							
						
					
					
						commit
						4dd6f0cb4c
					
				@ -31,10 +31,7 @@ module Homebrew extend self
 | 
			
		||||
      end
 | 
			
		||||
      if not File.exist? name and name =~ HOMEBREW_TAP_FORMULA_REGEX then
 | 
			
		||||
        require 'cmd/tap'
 | 
			
		||||
        begin
 | 
			
		||||
          install_tap $1, $2
 | 
			
		||||
        rescue AlreadyTappedError
 | 
			
		||||
        end
 | 
			
		||||
        install_tap $1, $2
 | 
			
		||||
      end
 | 
			
		||||
    end unless ARGV.force?
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -61,10 +61,7 @@ module Homebrew extend self
 | 
			
		||||
      migration = TAP_MIGRATIONS[f]
 | 
			
		||||
      next unless migration
 | 
			
		||||
      tap_user, tap_repo = migration.split '/'
 | 
			
		||||
      begin
 | 
			
		||||
        install_tap tap_user, tap_repo
 | 
			
		||||
      rescue AlreadyTappedError
 | 
			
		||||
      end
 | 
			
		||||
      install_tap tap_user, tap_repo
 | 
			
		||||
    end if load_tap_migrations
 | 
			
		||||
 | 
			
		||||
    if report.empty?
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user