Merge lp:~xnox/ubiquity/dmidecode-fixes into lp:ubiquity

[Dimitri John Ledkov]

[lp:~xnox/ubiquity/dmidecode-fixes]

6234. By Dimitri John Ledkov on 2014-11-26

* Add --quiet option to dmidecode calls, in the future release that will
  prevent dmidecode from printing error banner if a newer than dmidecode
  smbios version has happened to be in use. LP: #1353580.
* Add "support" for Gauja laptops and self-builts - that is do not use
  "To be filled by O.E.M." as a valid model name.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-12 14:34:56 +0000
+++ debian/changelog	2014-11-26 00:17:21 +0000
@@ -1,3 +1,13 @@
+ubiquity (2.21.1) UNRELEASED; urgency=medium
+
+  * Add --quiet option to dmidecode calls, in the future release that will
+    prevent dmidecode from printing error banner if a newer than dmidecode
+    smbios version has happened to be in use. LP: #1353580.
+  * Add "support" for Gauja laptops and self-builts - that is do not use
+    "To be filled by O.E.M." as a valid model name.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 26 Nov 2014 00:08:30 +0000
+
 ubiquity (2.21.0) vivid; urgency=medium
 
   [ Colin Watson ]

=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py	2014-09-12 18:24:34 +0000
+++ ubiquity/misc.py	2014-11-26 00:17:21 +0000
@@ -609,7 +609,7 @@
         kwargs['stderr'] = open('/dev/null', 'w')
     try:
         proc = subprocess.Popen(
-            ['dmidecode', '--string', 'system-manufacturer'],
+            ['dmidecode', '--quiet', '--string', 'system-manufacturer'],
             stdout=subprocess.PIPE, universal_newlines=True, **kwargs)
         manufacturer = proc.communicate()[0]
         if not manufacturer:
@@ -626,9 +626,10 @@
                 key = 'system-version'
             else:
                 key = 'system-product-name'
-            proc = subprocess.Popen(['dmidecode', '--string', key],
-                                    stdout=subprocess.PIPE,
-                                    universal_newlines=True)
+            proc = subprocess.Popen(
+                ['dmidecode', '--quiet', '--string', key],
+                stdout=subprocess.PIPE,
+                universal_newlines=True)
             model = proc.communicate()[0]
         if 'apple' in manufacturer:
             # MacBook4,1 - strip the 4,1
@@ -638,6 +639,8 @@
         model = re.sub('[^a-zA-Z0-9]+', '-', model).rstrip('-').lstrip('-')
         if model.lower() == 'not-available':
             return
+        if model.lower() == "To be filled by O.E.M.".lower():
+            return
     except Exception:
         syslog.syslog(syslog.LOG_ERR, 'Unable to determine the model from DMI')
     finally: