From 952950575b9be095a4dd5452acc210a03092109a Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Fri, 19 Apr 2019 12:43:30 +0200
Subject: [PATCH] Homogeneize the VERBOSE param/env var bw commands.
---
Rakefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Rakefile b/Rakefile
index 55e5823d34f..40e4dd669f2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -154,11 +154,7 @@ namespace :gen do
exit(1)
end
- if ENV['VERBOSE']
- options[:verbose] = ENV['VERBOSE'].to_i
- else
- options[:verbose] = 0
- end
+ options[:verbose] = ENV['VERBOSE'].to_i if ENV['VERBOSE']
ret = generate_oar_properties(options)
exit(ret)
@@ -175,7 +171,7 @@ namespace :gen do
options = {}
options[:sites] = ( ENV['SITE'] ? ENV['SITE'].split(',') : G5K_SITES )
options[:output_dir] = ENV['OUTPUTDIR'] || PUPPET_ODIR
- options[:verbose] = (ENV['VERBOSE'] != nil)
+ options[:verbose] = true if ENV['VERBOSE']
options[:conf_dir] = ENV['CONFDIR'] if ENV['CONFDIR']
send("generate_puppet_#{t}", options)
--
GitLab