diff -Nru ubiquity-2.21.20/debian/changelog ubiquity-2.21.21/debian/changelog --- ubiquity-2.21.20/debian/changelog 2015-04-15 04:05:19.000000000 +0000 +++ ubiquity-2.21.21/debian/changelog 2015-04-15 17:52:34.000000000 +0000 @@ -1,3 +1,9 @@ +ubiquity (2.21.21) vivid; urgency=medium + + * KDE: ubiquity/plugins/ubi-console-setup.py workaround for LP: #1182784 + + -- Jonathan Riddell Wed, 15 Apr 2015 19:28:00 +0200 + ubiquity (2.21.20) vivid; urgency=medium * Automatic update of included source packages: partman-auto diff -Nru ubiquity-2.21.20/ubiquity/plugins/ubi-console-setup.py ubiquity-2.21.21/ubiquity/plugins/ubi-console-setup.py --- ubiquity-2.21.20/ubiquity/plugins/ubi-console-setup.py 2015-04-15 03:59:39.000000000 +0000 +++ ubiquity-2.21.21/ubiquity/plugins/ubi-console-setup.py 2015-04-15 17:27:18.000000000 +0000 @@ -287,18 +287,31 @@ def on_keyboard_layout_selected(self, *args): layout = self.get_keyboard() lang = self.controller.dbfilter.get_locale() - if layout is not None: - # skip updating keyboard if not using display - if self.keyboardDisplay: - ly = keyboard_names.layout_id(lang, misc.utf8(layout)) - self.keyboardDisplay.setLayout(ly) + try: + if layout is not None: + # skip updating keyboard if not using display + if self.keyboardDisplay: + ly = keyboard_names.layout_id(lang, misc.utf8(layout)) + self.keyboardDisplay.setLayout(ly) - # no variants, force update by setting none - # if not keyboard_names.has_variants(l, ly): - # self.keyboardDisplay.setVariant(None) + # no variants, force update by setting none + # if not keyboard_names.has_variants(l, ly): + # self.keyboardDisplay.setVariant(None) - self.current_layout = layout - self.controller.dbfilter.change_layout(layout) + self.current_layout = layout + self.controller.dbfilter.change_layout(layout) + except KeyError: + from PyQt4.QtGui import QMessageBox + QMessageBox.warning(self.page, 'Installer bug', + 'Could not find text for ' + str(layout) + + ' see bug ' + + '1182784.

' + + 'Please select another and reconfigure ' + + 'after install.') + self.debug('Could not find text for ' + str(layout) + + ' see https://bugs.launchpad.net/' + + 'ubuntu/+source/ubiquity/+bug/1182784') @plugin.only_this_page def on_keyboard_variant_selected(self, *args):