Merge lp:~didrocks/ubiquity/oem-mode-telemetry into lp:ubiquity

[Didier Roche-Tolomelli]

Record OEM installation mode

[Iain Lane (laney)]

yep, thanks!

review: Approve

[lp:~didrocks/ubiquity/oem-mode-telemetry]

6619. By Didier Roche-Tolomelli on 2018-04-23

Update changelog for record OEM installation mode

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-23 11:02:43 +0000
+++ debian/changelog	2018-04-23 16:41:18 +0000
@@ -3,6 +3,7 @@
   [ Colin Watson ]
   * Update translations from Launchpad.
 
+<<<<<<< TREE
   [ Simon Quigley ]
   * Following the lead of the GTK frontend, remove the encrypted home
     directory option from the Qt installer since ecryptfs no longer has
@@ -18,6 +19,12 @@
   * Do not start gnome-initial-setup for the OEM user (LP: #1765651)
 
  -- Adam Conrad <[e-mail]>  Mon, 23 Apr 2018 04:59:24 -0600
+=======
+  [ Didier Roche ]
+  * Record OEM installation mode in telemetry data. (LP: #1765693)
+
+ -- Colin Watson <[e-mail]>  Sun, 22 Apr 2018 11:20:16 +0100
+>>>>>>> MERGE-SOURCE
 
 ubiquity (18.04.9) bionic; urgency=medium
 

=== modified file 'ubiquity/telemetry.py'
--- ubiquity/telemetry.py	2018-03-26 07:23:30 +0000
+++ ubiquity/telemetry.py	2018-04-23 16:41:18 +0000
@@ -84,6 +84,8 @@
         self._metrics['Language'] = db.get('localechooser/languagelist')
         self._metrics['Minimal'] = self._db_get_bool(
             db.get('ubiquity/minimal_install'))
+        self._metrics['OEM'] = self._db_get_bool(
+            db.get('oem-config/enable'))
         self._metrics['RestrictedAddons'] = self._db_get_bool(
             db.get('ubiquity/use_nonfree'))
         self._metrics['Stages'] = self._stages_hist