Merge lp:~xnox/ubiquity/voodoo into lp:ubiquity

Proposed by Dimitri John Ledkov on 2012-10-19
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~xnox/ubiquity/voodoo
Merge into: lp:ubiquity
Prerequisite: lp:~xnox/ubiquity/r-proposed
Diff against target: 84 lines (+4/-21)
5 files modified
bin/oem-config-firstboot (+0/-8)
debian/changelog (+2/-0)
ubiquity/i18n.py (+1/-5)
ubiquity/plugins/ubi-language.py (+0/-6)
ubiquity/plugins/ubi-timezone.py (+1/-2)
To merge this branch: bzr merge lp:~xnox/ubiquity/voodoo
Reviewer Review Type Date Requested Status
Ubuntu Installer Team 2012-10-19 Pending
Review via email: mp+130613@code.launchpad.net

Description of the change

Not sure if some other fontconfigury should be called instead....

To post a comment you must log in.
lp:~xnox/ubiquity/voodoo updated on 2012-10-19
5763. By Dimitri John Ledkov on 2012-10-19

Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
should be called instead. (LP: #1043031)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/oem-config-firstboot'
2--- bin/oem-config-firstboot 2012-03-21 20:39:21 +0000
3+++ bin/oem-config-firstboot 2012-10-19 17:07:24 +0000
4@@ -35,14 +35,6 @@
5 # Remove the oem-config-prepare menu item.
6 rm -f /usr/share/applications/oem-config-prepare-gtk.desktop \
7 /usr/share/applications/kde4/oem-config-prepare-kde.desktop
8-# Adjust fontconfig configuration, if possible.
9-if type fontconfig-voodoo >/dev/null 2>&1; then
10- RET="$(echo GET debian-installer/locale | debconf-communicate)"
11- if [ "${RET%% *}" = 0 ]; then
12- LC_ALL="${RET#* }" fontconfig-voodoo --auto --force --quiet \
13- || true
14- fi
15-fi
16 # Run a command just before starting oem-config.
17 RET="$(echo GET oem-config/early_command | debconf-communicate)" || true
18 if [ "${RET%% *}" = 0 ]; then
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2012-10-19 17:07:24 +0000
22+++ debian/changelog 2012-10-19 17:07:24 +0000
23@@ -11,6 +11,8 @@
24 * When auto-partitioning is not possible, allow to manually partition
25 the same drive installation medium is on. (LP: #1053030)
26 * Fix the question_dialog height-for-width (LP: #862270)
27+ * Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
28+ should be called instead. (LP: #1043031)
29
30 -- Colin Watson <cjwatson@ubuntu.com> Fri, 19 Oct 2012 15:26:28 +0100
31
32
33=== modified file 'ubiquity/i18n.py'
34--- ubiquity/i18n.py 2012-09-25 20:59:09 +0000
35+++ ubiquity/i18n.py 2012-10-19 17:07:24 +0000
36@@ -30,8 +30,7 @@
37 from ubiquity import misc, im_switch
38
39
40-# if 'just_country' is True, only the country is changing
41-def reset_locale(frontend, just_country=False):
42+def reset_locale(frontend):
43 frontend.start_debconf()
44 di_locale = frontend.db.get('debian-installer/locale')
45 if not di_locale:
46@@ -47,9 +46,6 @@
47 except locale.Error as e:
48 print('locale.setlocale failed: %s (LANG=%s)' % (e, di_locale),
49 file=sys.stderr)
50- if not just_country:
51- misc.execute_root('fontconfig-voodoo',
52- '--auto', '--force', '--quiet')
53 im_switch.start_im()
54 return di_locale
55
56
57=== modified file 'ubiquity/plugins/ubi-language.py'
58--- ubiquity/plugins/ubi-language.py 2012-10-19 17:07:24 +0000
59+++ ubiquity/plugins/ubi-language.py 2012-10-19 17:07:24 +0000
60@@ -748,10 +748,4 @@
61 locale.setlocale(locale.LC_ALL, '')
62 except locale.Error:
63 pass
64- # fontconfig configuration needs to be adjusted based on the
65- # selected locale (from language-selector-common.postinst). Ignore
66- # errors.
67- misc.execute(
68- 'chroot', target, 'fontconfig-voodoo',
69- '--auto', '--force', '--quiet')
70 return rv
71
72=== modified file 'ubiquity/plugins/ubi-timezone.py'
73--- ubiquity/plugins/ubi-timezone.py 2012-09-25 20:59:09 +0000
74+++ ubiquity/plugins/ubi-timezone.py 2012-10-19 17:07:24 +0000
75@@ -704,8 +704,7 @@
76
77 def cleanup(self):
78 plugin.Plugin.cleanup(self)
79- self.ui.controller.set_locale(
80- i18n.reset_locale(self.frontend, just_country=True))
81+ self.ui.controller.set_locale(i18n.reset_locale(self.frontend))
82
83
84 class Install(plugin.InstallPlugin):

Subscribers

People subscribed via source and target branches

to status/vote changes: