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

Proposed by Iain Lane on 2017-09-07
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-09-07
Approved revision: 6563
Merged at revision: 6563
Proposed branch: lp:~laney/ubiquity/lp1715605
Merge into: lp:ubiquity
Diff against target: 28 lines (+11/-0)
2 files modified
debian/changelog (+9/-0)
ubiquity/plugins/ubi-console-setup.py (+2/-0)
To merge this branch: bzr merge lp:~laney/ubiquity/lp1715605
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-09-07 Approve on 2017-09-07
Review via email: mp+330352@code.launchpad.net
To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-09-06 14:30:53 +0000
3+++ debian/changelog 2017-09-07 12:19:34 +0000
4@@ -1,3 +1,12 @@
5+ubiquity (17.10.7) UNRELEASED; urgency=medium
6+
7+ * ubi-console-setup.py: Set DPKG_MAINTSCRIPT_{NAME,PACKAGE} variables for
8+ our manual running of keyboard-configuration.postinst. This script now
9+ runs dpkg-maintscript-helper to remove an old conffile. That code won't
10+ fire in ubiquity, but we still need to not error out. (LP: #1715605)
11+
12+ -- Iain Lane <iain.lane@canonical.com> Thu, 07 Sep 2017 13:15:32 +0100
13+
14 ubiquity (17.10.6) artful; urgency=medium
15
16 [ David Mohammed ]
17
18=== modified file 'ubiquity/plugins/ubi-console-setup.py'
19--- ubiquity/plugins/ubi-console-setup.py 2017-07-18 15:21:41 +0000
20+++ ubiquity/plugins/ubi-console-setup.py 2017-09-07 12:19:34 +0000
21@@ -477,6 +477,8 @@
22 'OVERRIDE_USE_DEBCONF_LOCALE': '1',
23 'LC_ALL': di_locale,
24 'PATH': '/usr/lib/ubiquity/console-setup:' + os.environ['PATH'],
25+ 'DPKG_MAINTSCRIPT_NAME': 'postinst',
26+ 'DPKG_MAINTSCRIPT_PACKAGE': 'keyboard-configuration',
27 }
28 return command, questions, environ
29

Subscribers

People subscribed via source and target branches

to status/vote changes: