refactoring as we can get dependants before installing
This commit is contained in:
		
							parent
							
								
									8c203df671
								
							
						
					
					
						commit
						971a8b40e6
					
				@ -236,50 +236,32 @@ module Homebrew
 | 
			
		||||
          verbose:                    args.verbose?,
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        if args.ask?
 | 
			
		||||
          dependants = Upgrade.dependants(
 | 
			
		||||
            formulae_to_install,
 | 
			
		||||
            flags:                      args.flags_only,
 | 
			
		||||
            dry_run:                    args.dry_run?,
 | 
			
		||||
            ask:                        args.ask?,
 | 
			
		||||
            force_bottle:               args.force_bottle?,
 | 
			
		||||
            build_from_source_formulae: args.build_from_source_formulae,
 | 
			
		||||
            interactive:                args.interactive?,
 | 
			
		||||
            keep_tmp:                   args.keep_tmp?,
 | 
			
		||||
            debug_symbols:              args.debug_symbols?,
 | 
			
		||||
            force:                      args.force?,
 | 
			
		||||
            debug:                      args.debug?,
 | 
			
		||||
            quiet:                      args.quiet?,
 | 
			
		||||
            verbose:                    args.verbose?,
 | 
			
		||||
          )
 | 
			
		||||
        dependants = Upgrade.dependants(
 | 
			
		||||
          formulae_to_install,
 | 
			
		||||
          flags:                      args.flags_only,
 | 
			
		||||
          dry_run:                    args.dry_run?,
 | 
			
		||||
          ask:                        args.ask?,
 | 
			
		||||
          force_bottle:               args.force_bottle?,
 | 
			
		||||
          build_from_source_formulae: args.build_from_source_formulae,
 | 
			
		||||
          interactive:                args.interactive?,
 | 
			
		||||
          keep_tmp:                   args.keep_tmp?,
 | 
			
		||||
          debug_symbols:              args.debug_symbols?,
 | 
			
		||||
          force:                      args.force?,
 | 
			
		||||
          debug:                      args.debug?,
 | 
			
		||||
          quiet:                      args.quiet?,
 | 
			
		||||
          verbose:                    args.verbose?,
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        if args.ask?
 | 
			
		||||
          formulae_dependencies = Install.collect_dependencies(formulae_installer, dependants)
 | 
			
		||||
          # Main block: if asking the user is enabled, show dependency and size information.
 | 
			
		||||
          Install.ask_formulae(formulae_dependencies, args: args)
 | 
			
		||||
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        Upgrade.upgrade_formulae(formulae_installer,
 | 
			
		||||
                                 dry_run: args.dry_run?,
 | 
			
		||||
                                 verbose: args.verbose?)
 | 
			
		||||
 | 
			
		||||
        unless args.ask?
 | 
			
		||||
          dependants = Upgrade.dependants(
 | 
			
		||||
            formulae_to_install,
 | 
			
		||||
            flags:                      args.flags_only,
 | 
			
		||||
            dry_run:                    args.dry_run?,
 | 
			
		||||
            force_bottle:               args.force_bottle?,
 | 
			
		||||
            build_from_source_formulae: args.build_from_source_formulae,
 | 
			
		||||
            interactive:                args.interactive?,
 | 
			
		||||
            keep_tmp:                   args.keep_tmp?,
 | 
			
		||||
            debug_symbols:              args.debug_symbols?,
 | 
			
		||||
            force:                      args.force?,
 | 
			
		||||
            debug:                      args.debug?,
 | 
			
		||||
            quiet:                      args.quiet?,
 | 
			
		||||
            verbose:                    args.verbose?,
 | 
			
		||||
          )
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        if dependants.present?
 | 
			
		||||
          Upgrade.upgrade_dependents(
 | 
			
		||||
            dependants, formulae_to_install,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user