concise output of distro information printing

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index e51d5cd..c607dbc 100644 (file)
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -55,29 +55,29 @@ RPM_RE  = re.compile("(.*)\.(.*) (.*)-(.*)")
 RPM_FMT = "%(name)s.%(arch)s %(ver_rel)s"
 SRPM_RE = re.compile("(.*)-(\d+.*)-(\d+\.\d+).src.rpm")
 
-SUPPORT_DISTS = (
-    'SuSE',
-    'debian',
-    'fedora',
-    'redhat',
-    'centos',
-    'meego',
-    'moblin',
-    'tizen',
-)
-
-get_machine = platform.machine
-
-# detect linux distribution, support "meego"
 def get_distro():
+    """Detect linux distribution, support "meego"
+    """
+
+    support_dists = ('SuSE',
+                     'debian',
+                     'fedora',
+                     'redhat',
+                     'centos',
+                     'meego',
+                     'moblin',
+                     'tizen')
     try:
         (dist, ver, id) = platform.linux_distribution( \
-                              supported_dists = SUPPORT_DISTS)
+                              supported_dists = support_dists)
     except:
         (dist, ver, id) = platform.dist( \
-                              supported_dists = SUPPORT_DISTS)
+                              supported_dists = support_dists)
 
-    return (dist, ver, id)
+    if not dist:
+        return 'Unknown Linux Distro'
+    else:
+        return ' '.join(map(str.strip, (dist, ver, id)))
 
 _LOOP_RULE_PTH = "/etc/udev/rules.d/80-prevent-loop-present.rules"
 def hide_loopdev_presentation():

diff --git a/tools/mic b/tools/mic
index 8c87a05..f55b061 100755 (executable)
--- a/tools/mic
+++ b/tools/mic
@@ -204,10 +204,7 @@ class MicCmd(cmdln.Cmdln):
 
 if __name__ == "__main__":
     try:
-        distro = ' '.join(misc.get_distro()).strip()
-        machin = misc.get_machine()
-        msger.raw("mic %s (%s %s)" % (VERSION, distro, machin))
-
+        msger.raw("mic %s (%s)" % (VERSION, misc.get_distro()))
         mic = MicCmd()
         sys.exit(mic.main())