Merge lp:~nuclearbob/utah/media-info-mini into lp:utah

[Max Brustkern]

When running on a mini image, media info was missing, and this generated a type error when we tried to put None into the yaml, so I've changed it to use 'unknown' instead. When running pyflakes, I found there were two get_arch functions in that file, so I removed the one that wasn't currently in use.

[Javier Collado (javier.collado)]

What was the output of `platform.machine()` call in that case?

According to the python documentation, when the machine type cannot be
determined, the empty string is returned. Hence, maybe the `arches` dictionary
in the `get_arch` function has to be updated and the 'unknown' value should be
inserted for the empty string (if another non empty value is returned, then we
should consider adding it to the `arches` dictionary as well).

review: Needs Information

[Max Brustkern (nuclearbob)]

The get_media_info function tries to open /var/log/installer/media-info, and if it doesn't open that file, it leaves media_info as None. The platform.machine call in get_arch is working fine. We had get_arch defined two different ways, which was picked up by static analysis, so I deleted the first one, since the second one is what's getting used and working fine.

[Javier Collado (javier.collado)]

I see I got confused with the diff. Looks good.

review: Approve

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2012-12-08 02:10:12 +0000
+++ utah/client/common.py	2012-12-10 14:09:27 +0000
@@ -343,7 +343,7 @@
 
     filename = '/var/log/installer/media-info'
 
-    media_info = None
+    media_info = 'unknown'
 
     if os.path.exists(filename) and os.access(filename, os.R_OK):
         with open(filename, 'r') as f:
@@ -389,20 +389,6 @@
 
 def get_arch():
     """
-    The host's architecture (i.e. i386, amd64, etc.)
-    """
-    uname = platform.uname()
-
-    arch = {
-        'x86_64': 'amd64',
-        'x86': 'i386',
-    }.get(uname[5])  # 5 == processor
-
-    return arch
-
-
-def get_arch():
-    """
     The host's architecture.
 
     Returns the human readable architecture or 'unknown'.