From 9b8fbb240d5d8fa66a128f18cbedd8b8e8c2fee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Thu, 5 Jul 2012 12:45:03 +0200
Subject: [PATCH] Bug #1334: Add sanity checks to oneacct (cherry picked from
 commit 7f4db04a34f8a3af916e4e09f5e78b3e87de7e8d)

---
 src/cli/oneacct | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/cli/oneacct b/src/cli/oneacct
index ecd1554fbb..527cd8aa5a 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -136,15 +136,19 @@ public
             CLIHelper.scr_bold
             CLIHelper.scr_underline
 
-            username =
-                xmldoc.retrieve_elements(["HISTORY/VM[UID=#{uid}]/UNAME"]).uniq;
-            puts "# User #{uid} #{username}    "
+            username_elems =
+                xmldoc.retrieve_elements(["HISTORY/VM[UID=#{uid}]/UNAME"])
+
+            username = username_elems.nil? ? "" : username_elems.uniq
+
+            puts "# User #{uid} #{username}".ljust(80)
             CLIHelper.scr_restore
             puts
 
             history_elems.clear
 
             vm_ids = xmldoc.retrieve_elements("HISTORY/VM[UID=#{uid}]/ID")
+            vm_ids = [] if vm_ids.nil?
             vm_ids.uniq!
 
             vm_ids.each do |vid|