Merge lp:~jderose/ubiquity/fix-1539266 into lp:~ubuntu-installer/ubiquity/trusty-proposed

[Jason Gerard DeRose]

1) Adds SMBIOS28_JUNK module variable for better readability when using this value within dmimodel().

2) Changes dmimodel() to check if the resulting model starts with SMBIOS28_JUNK, and if so, to strip this prefix.

The comment above SMBIOS28_JUNK provides an explanation, and this bug provides more background:

https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1539266

In the future, I do wonder if it might be better for Ubiquity to get these values from /sys/class/dmi/id/*.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me.

review: Approve

=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py	2014-09-12 19:16:44 +0000
+++ ubiquity/misc.py	2016-01-28 23:10:13 +0000
@@ -600,6 +600,14 @@
         return text
 
 
+# On hardware that uses SMBIOS 2.8+, dmidecode 2.12 will contain this warning
+# message prefixed before system-version, system-product-name, etc.  This is
+# problematic as the default hostname built by Ubiquity wont be valid (it's too
+# long), so we strip this prefix.  Note there is no reason to forward-port this
+# to Xenial as it uses dmidecode 3.0, which doesn't have this problem.
+SMBIOS28_JUNK = 'SMBIOS-implementations-newer-than-version-2-8-are-not-fully-\
+supported-by-this-version-of-dmidecode-'
+
 @raise_privileges
 def dmimodel():
     model = ''
@@ -638,6 +646,8 @@
         model = re.sub('[^a-zA-Z0-9]+', '-', model).rstrip('-').lstrip('-')
         if model.lower() == 'not-available':
             return
+        if model.startswith(SMBIOS28_JUNK):
+            model = model[len(SMBIOS28_JUNK):]
     except Exception:
         syslog.syslog(syslog.LOG_ERR, 'Unable to determine the model from DMI')
     finally: