From 8708f0222f8d3e865dc2dad0119f3d97ee21de79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 8 Sep 2014 14:59:45 +0200
Subject: [PATCH] Feature #2796: Update --force description

---
 src/cli/one_helper/oneuser_helper.rb | 6 +++---
 src/cli/oneuser                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb
index 25c016598a..6a0db32b98 100644
--- a/src/cli/one_helper/oneuser_helper.rb
+++ b/src/cli/one_helper/oneuser_helper.rb
@@ -162,7 +162,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         # Check that ONE_AUTH target can be written
         #-----------------------------------------------------------------------
         if File.file?(ONE_AUTH) && !options[:force]
-                return -1, "File #{ONE_AUTH} exists, use --force to overwirte"
+                return -1, "File #{ONE_AUTH} exists, use --force to overwrite"
         end
 
         #-----------------------------------------------------------------------
@@ -348,8 +348,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         puts str % ["SECONDARY GROUPS", groups.join(',') ] if groups.size > 1
         puts str % ["PASSWORD",    user['PASSWORD']]
         puts str % ["AUTH_DRIVER", user['AUTH_DRIVER']]
-        puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']]
-        puts str % ["VALIDITY", "not after #{Time.at(user['LOGIN_TOKEN/EXPIRATION_TIME'].to_i)}"] if !user['LOGIN_TOKEN/EXPIRATION_TIME'].nil?
+        puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']] if !user['LOGIN_TOKEN/TOKEN'].nil?
+        puts str % ["TOKEN VALIDITY", "not after #{Time.at(user['LOGIN_TOKEN/EXPIRATION_TIME'].to_i)}"] if !user['LOGIN_TOKEN/EXPIRATION_TIME'].nil?
         puts str % ["ENABLED",
             OpenNebulaHelper.boolean_to_str(user['ENABLED'])]
 
diff --git a/src/cli/oneuser b/src/cli/oneuser
index 08c5d405af..14607e3993 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -134,7 +134,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     FORCE = {
         :name   => "force",
         :large  => "--force" ,
-        :description => "Force probe upgrade in onehost sync"
+        :description => "Force one_auth file rewrite"
     }
 
     create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]