@@ -512,7 +512,6 @@ def _setup_signaling():
512
512
signal .signal (signal .SIGHUP , clean_up_process )
513
513
signal .signal (signal .SIGQUIT , clean_up_process )
514
514
515
-
516
515
def _disable_boto_modules ():
517
516
""" Disable the unneeded boto modules because they cause issues with the loader """
518
517
# Disable all of salt's boto modules, they give nothing but trouble to the loader
@@ -636,12 +635,13 @@ def _setup_logging(parsed_args):
636
635
if __opts__ ['daemonize' ]:
637
636
__opts__ ['log_level' ] = 'info'
638
637
# Handle the explicit -vvv settings
639
- if __opts__ ['verbose' ] == 1 :
640
- __opts__ ['log_level' ] = 'warning'
641
- elif __opts__ ['verbose' ] == 2 :
642
- __opts__ ['log_level' ] = 'info'
643
- elif __opts__ ['verbose' ] >= 3 :
644
- __opts__ ['log_level' ] = 'debug'
638
+ if __opts__ ['verbose' ]:
639
+ if __opts__ ['verbose' ] == 1 :
640
+ __opts__ ['log_level' ] = 'warning'
641
+ elif __opts__ ['verbose' ] == 2 :
642
+ __opts__ ['log_level' ] = 'info'
643
+ elif __opts__ ['verbose' ] >= 3 :
644
+ __opts__ ['log_level' ] = 'debug'
645
645
# Console logging is probably the same, but can be different
646
646
console_logging_opts = {
647
647
'log_level' : __opts__ .get ('console_log_level' , __opts__ ['log_level' ]),
0 commit comments