From 5efc50fca0db2a5014b0b26f9131214935001007 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 1 Nov 2007 17:44:28 +0000
Subject: [PATCH] Separate OS status and path

Make _DiagnoseOSStatus only return a status message for the OS diagnose object
and create a new _DiagnoseOSPath function to get the path out. This will let us
be more flexible in the messages we display to the user.

Reviewed-By: imsnah
---
 scripts/gnt-os | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/scripts/gnt-os b/scripts/gnt-os
index a13d2ca89..d422a1dcb 100755
--- a/scripts/gnt-os
+++ b/scripts/gnt-os
@@ -75,9 +75,25 @@ def _DiagnoseOSStatus(obj):
   """
 
   if _DiagnoseOSValid(obj):
-    return "valid (path: %s)" % obj.path
+    return "valid"
   else:
-    return "%s (path: %s)" % (obj.args[2], obj.args[1])
+    return obj.args[2]
+
+
+def _DiagnoseOSPath(obj):
+  """Get the path out of an OS diagnose object.
+
+    Args:
+      obj: an diagnostic object as returned by OpDiagnoseOS
+
+    Returns:
+      string: the OS path
+
+  """
+  if _DiagnoseOSValid(obj):
+    return obj.path
+  else:
+    return obj.args[1]
 
 
 def _DiagnoseByOS(rlist):
-- 
GitLab