Merge lp:~laney/ubiquity/lp1715605 into lp:ubiquity

[Iain Lane]

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good. I think this is probably the best way to avoid the maintscript-helper running. Those were never designed to be run through ubiquity / outside of a proper package install scenario, so we need to accomodate.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-09-06 14:30:53 +0000
+++ debian/changelog	2017-09-07 12:19:34 +0000
@@ -1,3 +1,12 @@
+ubiquity (17.10.7) UNRELEASED; urgency=medium
+
+  * ubi-console-setup.py: Set DPKG_MAINTSCRIPT_{NAME,PACKAGE} variables for
+    our manual running of keyboard-configuration.postinst. This script now
+    runs dpkg-maintscript-helper to remove an old conffile. That code won't
+    fire in ubiquity, but we still need to not error out. (LP: #1715605)
+
+ -- Iain Lane <[e-mail]>  Thu, 07 Sep 2017 13:15:32 +0100
+
 ubiquity (17.10.6) artful; urgency=medium
 
   [ David Mohammed ]
 
=== modified file 'ubiquity/plugins/ubi-console-setup.py'
--- ubiquity/plugins/ubi-console-setup.py	2017-07-18 15:21:41 +0000
+++ ubiquity/plugins/ubi-console-setup.py	2017-09-07 12:19:34 +0000
@@ -477,6 +477,8 @@
             'OVERRIDE_USE_DEBCONF_LOCALE': '1',
             'LC_ALL': di_locale,
             'PATH': '/usr/lib/ubiquity/console-setup:' + os.environ['PATH'],
+            'DPKG_MAINTSCRIPT_NAME': 'postinst',
+            'DPKG_MAINTSCRIPT_PACKAGE': 'keyboard-configuration',
         }
         return command, questions, environ