anaconda-patches September 2014

anaconda-patches@lists.fedorahosted.org

17 participants
212 discussions

[master/f21/rhel7-branch] Add support for language selection in text mode. (#1000326)
by Samantha N. Bueno 30 Sep '14

30 Sep '14

As the subject says. A couple of things you might care about: * There is only support for selecting/installing one language. Limited, yes, but so is text mode. Someone can file a bug if they want the ability to add more. Or, you know, do a graphical or ks installation. * This only affects the language of the installed system. The installer itself will still be displayed in English. * Only English names for languages and locales are displayed. Resolves: rhbz#1000326 --- pyanaconda/ui/tui/spokes/langsupport.py | 130 ++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 pyanaconda/ui/tui/spokes/langsupport.py diff --git a/pyanaconda/ui/tui/spokes/langsupport.py b/pyanaconda/ui/tui/spokes/langsupport.py new file mode 100644 index 0000000..262e38a --- /dev/null +++ b/pyanaconda/ui/tui/spokes/langsupport.py @@ -0,0 +1,130 @@ +# Language text spoke +# +# Copyright (C) 2014 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# the GNU General Public License v.2, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY expressed or implied, including the implied warranties of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. You should have received a copy of the +# GNU General Public License along with this program; if not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the +# source code or documentation are not subject to the GNU General Public +# License and may only be used or replicated with the express permission of +# Red Hat, Inc. +# +# Red Hat Author(s): Samantha N. Bueno <sbueno(a)redhat.com> +# + +from pyanaconda.ui.tui.spokes import NormalTUISpoke +from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget +from pyanaconda.ui.common import FirstbootSpokeMixIn +from pyanaconda import localization +from pyanaconda.i18n import N_, _ + +from pyanaconda import flags + +import logging +log = logging.getLogger("anaconda") + +class LangSpoke(FirstbootSpokeMixIn, NormalTUISpoke): + """ + This spoke allows a user to select their installed language. Note that this + does not affect the display of the installer, it only will affect the system + post-install, because it's too much of a pain to make other languages work + in text-mode. + + Also this doesn't allow for selection of multiple languages like in the GUI. + """ + title = N_("Language settings") + category = "localization" + + def __init__(self, app, data, storage, payload, instclass): + NormalTUISpoke.__init__(self, app, data, storage, payload, instclass) + + self._langs = [localization.get_english_name(lang) + for lang in localization.get_available_translations()] + self._langs_and_locales = dict((localization.get_english_name(lang), lang) + for lang in localization.get_available_translations()) + self._locales = dict((lang, localization.get_language_locales(lang)) + for lang in self._langs_and_locales.values()) + self._selected = self.data.lang.lang + + @property + def completed(self): + if flags.flags.automatedInstall: + return self.data.lang.lang and self.data.lang.lang != "" + else: + return False + + @property + def mandatory(self): + return False + + @property + def status(self): + if self.data.lang.lang: + return localization.get_english_name(self._selected) + else: + return _("Language is not set.") + + def refresh(self, args=None): + """ + args is None if we want a list of languages; or, it is a list of all + locales for a language. + """ + NormalTUISpoke.refresh(self, args) + + if args: + self._window += [TextWidget(_("Available locales"))] + displayed = [TextWidget(localization.get_english_name(z)) for z in args] + else: + self._window += [TextWidget(_("Available languages"))] + displayed = [TextWidget(z) for z in self._langs] + + def _prep(i, w): + """ make everything look nice """ + number = TextWidget("%2d)" % (i + 1)) + return ColumnWidget([(4, [number]), (None, [w])], 1) + + # split zones to three columns + middle = len(displayed) / 3 + left = [_prep(i, w) for i, w in enumerate(displayed) if i <= middle] + center = [_prep(i, w) for i, w in enumerate(displayed) if i > middle and i <= 2*middle] + right = [_prep(i, w) for i, w in enumerate(displayed) if i > 2*middle] + + c = ColumnWidget([(24, left), (24, center), (24, right)], 3) + self._window.append(c) + + return True + + def input(self, args, key): + """ Handle user input. """ + try: + keyid = int(key) - 1 + if args: + self._selected = args[keyid] + self.apply() + self.close() + else: + self.app.switch_screen(self, self._locales[self._langs_and_locales[self._langs[keyid]]]) + return True + except (ValueError, IndexError): + pass + + if key.lower() == "b": + self.app.switch_screen(self, None) + return True + else: + return key + + def prompt(self, args=None): + """ Override default prompt with a custom prompt. """ + return _("Please select language support to install.\nUse numbers or type names directly [b to language list, c to continue, q to quit]: ") + + def apply(self): + """ Store the selected langsupport locales """ + self.data.lang.lang = self._selected -- 1.9.3

3 3

[PATCH rhel7-branch] Ignore two accelerator collisions on the filter screen.
by Chris Lumens 30 Sep '14

30 Sep '14

These are getting too hard to avoid, and collisions aren't exactly fatal anyway. It makes a slightly more awkward UI, but not significantly so. I may remove the fatal part of this check in the future. Related: rhbz#1065716 --- pyanaconda/ui/gui/spokes/filter.glade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index 2fe4430..35211da 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -241,6 +241,7 @@ </child> <child> <object class="GtkLabel" id="label15"> +  <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_LUN:</property> @@ -1405,6 +1406,7 @@ <property name="spacing">6</property> <child> <object class="GtkLabel" id="label22"> +  <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_LUN:</property> -- 1.9.3

2 1

[anaconda:rhel7 0/2] #1076055 patches (v4)
by Anne Mulhern 30 Sep '14

30 Sep '14

This is an anaconda only attempt, no accompanying blivet patch. mulhern (2): Remove too strict condition for changing size (#1076055) Changes for scheduling size change on an existing device (#1076055) pyanaconda/ui/gui/spokes/custom.py | 41 ++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) -- 1.9.3

2 3

[anaconda:rhel7/master 0/5] #1076055 related patches
by Anne Mulhern 30 Sep '14

30 Sep '14

The first three are trivial, but the last two are tricky. mulhern (5): Change "if <condition>:" to "else:" for clarity (#1076055) Use Size, not int, for size (#1076055) Quit on_device_type_changed() if self._current_selector is None (#1076055) Factor determination of field sensitivities into methods (#1076055) size related changes to save_right_side() (#1076055) pyanaconda/ui/gui/spokes/custom.py | 130 +++++++++++++++++++++++++++---------- 1 file changed, 96 insertions(+), 34 deletions(-) -- 1.9.3

3 9

[blivet][rhel7, master][PATCH] Remove a problematic remnant of singlePV.
by David Lehman 30 Sep '14

30 Sep '14

Resolves: rhbz#1147985 --- blivet/deviceaction.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py index 73af81f..b618b61 100644 --- a/blivet/deviceaction.py +++ b/blivet/deviceaction.py @@ -26,7 +26,6 @@ from . import util from . import udev from .devices import StorageDevice from .devices import PartitionDevice -from .devices import LVMLogicalVolumeDevice from .formats import getFormat from .storage_log import log_exception_info from parted import partitionFlag, PARTITION_LBA @@ -315,11 +314,6 @@ class ActionCreateDevice(DeviceAction): otherNum = action.device.partedPartition.number if selfNum > otherNum: rc = True - elif (action.isCreate and action.isDevice and - isinstance(self.device, LVMLogicalVolumeDevice) and - isinstance(action.device, LVMLogicalVolumeDevice) and - self.device.vg == action.device.vg): - rc = True elif (action.isAdd and action.container == self.container): rc = True -- 1.9.3

2 1

[PATCH 1/2] Convert python signal handlers to GLib signal handlers
by David Shea 30 Sep '14

30 Sep '14

If a signal is handled through python while the Gtk main loop is running, we get stuck waiting for a Gtk/GLib event before it releases the interperter lock, so just handle them as GLib events instead. --- pyanaconda/ui/gui/__init__.py | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index df98360..6a3dca3 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -18,7 +18,7 @@ # # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # -import inspect, os, sys, time, site +import inspect, os, sys, time, site, signal import meh.ui.gui from contextlib import contextmanager @@ -541,6 +541,38 @@ class GraphicalUserInterface(UserInterface): # Export the scale so that Gtk programs launched by anaconda are also scaled os.environ["GDK_SCALE"] = "2" + def _convertSignals(self): + # What tends to happen when we receive a signal is that the signal will + # be received by the python interpreter's C handler, python will do + # what it needs to do to set the python handler we registered to run, + # the C handler returns, and then nothing happens because Gtk is + # holding the global interpreter lock. The signal then gets delivered + # to our python code when you move the mouse or something. We can get + # around this by doing signals the GLib way. The conversion assumes + # that none of our signal handlers care about the frame parameter, + # which is generally true. + # + # After the unix_signal_add call, signal.getsignal will tell a half + # truth: the method returned will still be called, by way of + # _signal_converter, but GLib will have replaced the actual signal + # handler for that signal. + + # Convert everything except SIGCHLD, because that's a different can of worms + + def _signal_converter(user_data): + (handler, signum) = user_data + handler(signum) + + for signum in range(1, signal.SIGCHLD) + range(signal.SIGCHLD + 1, signal.NSIG): + handler = signal.getsignal(signum) + if handler and handler not in (signal.SIG_DFL, signal.SIG_IGN): + # NB: if you are looking at the glib documentation you are in for + # some surprises because gobject-introspection is a minefield. + # g_unix_signal_add_full comes out as GLib.unix_signal_add, and + # g_unix_signal_add doesn't come out at all. + GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signum, + _signal_converter, (handler, signum)) + @property def tty_num(self): return 6 @@ -648,6 +680,10 @@ class GraphicalUserInterface(UserInterface): Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + # The interaction between python signal handlers and Gtk is problematic, + # so convert them all to GLib signal handlers. + self._convertSignals() + # try to make sure a logo image is present self._assureLogoImage() -- 2.1.0

2 5

[PATCH rhel7-branch] network: support for bridge, require pykickstart with the support (#1075195)
by Radek Vykydal 30 Sep '14

30 Sep '14

Related: rhbz#1075195 --- anaconda.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 5fc27a0..85a3c27 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -20,7 +20,7 @@ Source0: %{name}-%{version}.tar.bz2 %define gettextver 0.11 %define intltoolver 0.31.2-3 %define libnlver 1.0 -%define pykickstartver 1.99.43.14 +%define pykickstartver 1.99.43.15 %define yumver 3.4.3-91 %define partedver 1.8.1 %define pypartedver 2.5-2 -- 1.9.3

2 1

[PATCH rhel7-branch] network: GUI: reactivate connection automatically after configuration (#1033063)
by Radek Vykydal 30 Sep '14

30 Sep '14

Resolves: rhbz#1033063 We used to require turning the connection off and on for the configuration to be actually applied which is what most of the users doesn't seem to expect. --- pyanaconda/ui/gui/spokes/network.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 355756f..6354041 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -541,6 +541,13 @@ class NetworkControlBox(GObject.GObject): log.debug("network: on_edit_connection: can't find connection for device %s", devname) return + if dev_cfg.device_type != NetworkManager.DeviceType.WIFI \ + and dev_cfg.get_iface() in nm.nm_activated_devices(): + # Reactivate the connection after configuring it (if it changed) + settings = nm.nm_get_settings(uuid, "connection", "uuid") + settings_changed = lambda: settings != nm.nm_get_settings(uuid, "connection", "uuid") + activate = (uuid, devname, settings_changed) + log.info("network: configuring connection %s device %s ssid %s", uuid, devname, self.selected_ssid) self.kill_nmce(msg="Configure button clicked") -- 1.9.3

1 1

[master/f21/rhel7-branch] No more /boot on LVM for you, s390x!
by Samantha N. Bueno 30 Sep '14

30 Sep '14

This caused too many stupid problems, and it is pointless anyway, because /boot had to be restricted to a single PV. So, just make /boot on a partition instead. I guess I need to make a blivet bug for this and reference that in the msg instead of the anaconda bug. Or do I? I'll find out.

4 14

[anaconda][rhel7-branch/master][PATCH] Show environment specified in kickstart as selected in the GUI (#1087831)
by Martin Kolman 30 Sep '14

30 Sep '14

Previously the environment name from kickstart was not properly normalized, so it did not match on available environments and was not selected in the software spoke. Also fix the spoke status not showing the environment name until the software spoke is first entered. Resolves: rhbz#1087831 Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- pyanaconda/ui/gui/spokes/software.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index b37114c..e8e1a31 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -23,7 +23,7 @@ from gi.repository import Gdk from pyanaconda.flags import flags from pyanaconda.i18n import _, N_ -from pyanaconda.packaging import PackagePayload, payloadMgr +from pyanaconda.packaging import PackagePayload, payloadMgr, NoSuchGroup from pyanaconda.threads import threadMgr, AnacondaThread from pyanaconda import constants, iutil @@ -201,7 +201,17 @@ class SoftwareSelectionSpoke(NormalSpoke): # they did an install without a desktop environment. This should # catch that one case. if flags.automatedInstall and self.data.packages.seen: - return _("Custom software selected") + # the environment store that is normally used to obtain the currently + # selected environment name is not loaded before the software spoke + # is first entered, so we show the name directly in such case + early_environment = _("Custom software selected") + if self.environment is not None: + try: + early_environment = self.payload.environmentDescription(self.environment)[0] + except NoSuchGroup: + # the currently set environment is unknown to our packaging backend + early_environment = _("Unknown custom software selected") + return early_environment return _("Nothing selected") @@ -241,8 +251,19 @@ class SoftwareSelectionSpoke(NormalSpoke): threadMgr.wait(constants.THREAD_PAYLOAD) self._environmentStore.clear() - if self.environment not in self.payload.environments: + # check if currently set environment is compatible with the currently available environments + normalized_environments = [self.payload.environmentDescription(env)[0] for env in self.payload.environments] + + # the environment might be totally unknown to our packaging backend + try: + current_normalized_environment = self.payload.environmentDescription(self.environment)[0] + except NoSuchGroup: + current_normalized_environment = None + + if not current_normalized_environment or current_normalized_environment not in normalized_environments: + # environment is invalid, clear it self.environment = None + current_normalized_environment = None firstEnvironment = True for environment in self.payload.environments: @@ -254,7 +275,7 @@ class SoftwareSelectionSpoke(NormalSpoke): # time this spoke was displayed; or # (2) Select the first environment given by display order as the # default if nothing is selected. - if (environment == self.environment) or \ + if (name == current_normalized_environment) or \ (not self.environment and firstEnvironment): self.environment = environment sel = self.builder.get_object("environmentSelector") -- 1.9.3

3 3

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2014