From 7eb278e7973fc820bfe3f85c49ba6d2c7950f6a5 Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Sun, 18 Jan 2015 20:07:04 +0100 Subject: [PATCH] Identified two verbosity levels: info, silent Conflicts: hacking/env-setup --- hacking/env-setup | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hacking/env-setup b/hacking/env-setup index 1516c35d4c0..c85c4b42a24 100644 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -5,7 +5,11 @@ PYTHONPATH=${PYTHONPATH-""} PATH=${PATH-""} MANPATH=${MANPATH-""} -verbosity=${1-""} +verbosity=${1-info} # Defaults to `info' if unspecified + +if [ "$verbosity" = -q ]; then + verbosity=silent +fi # When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE if [ -n "$BASH_SOURCE" ] ; then @@ -48,7 +52,7 @@ else current_dir="$ANSIBLE_HOME" fi cd "$ANSIBLE_HOME" -if [ "$verbosity" = "-q" ] ; then +if [ "$verbosity" = silent ] ; then gen_egg_info 2>1 1> /dev/null else gen_egg_info @@ -59,7 +63,7 @@ cd "$current_dir" # Print out values unless -q is set # -if [ "$verbosity" != "-q" ] ; then +if [ "$verbosity" != silent ] ; then echo "" echo "Setting up Ansible to run out of checkout..." echo ""