anaconda-patches September 2013

anaconda-patches@lists.fedorahosted.org

17 participants
168 discussions

[rhel6-branch] remove firmware files in ppc64 initrd
by David Cantrell 20 Sep '13

20 Sep '13

We hit the 32M limit again. Remove a list of firmware files that IBM has provided as non-applicable to ppc64. -- David Cantrell <dcantrell(a)redhat.com> Manager, Installer Engineering Team Red Hat, Inc. | Westford, MA | EST5EDT

2 2

[PATCH master] Use Sphinx documentation format in nm.py.
by Radek Vykydal 20 Sep '13

20 Sep '13

..as I promised --- pyanaconda/nm.py | 307 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 216 insertions(+), 91 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 880c9df..3c587dc 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -104,7 +104,11 @@ def _get_property(object_path, prop, interface_name_suffix=""): return prop.unpack()[0] def nm_state(): - """Return state of NetworkManager""" + """Return state of NetworkManager + + :return: state of NetworkManager + :rtype: integer + """ return _get_property("/org/freedesktop/NetworkManager", "State") # FIXME - use just GLOBAL? There is some connectivity checking @@ -112,17 +116,29 @@ def nm_state(): # and how it is implemented. # Also see Gio g_network_monitor_can_reach. def nm_is_connected(): - """Is NetworkManager connected?""" + """Is NetworkManager connected? + + :return: True if NM is connected, False otherwise. + :rtype: bool + """ return nm_state() in (NetworkManager.State.CONNECTED_GLOBAL, NetworkManager.State.CONNECTED_SITE, NetworkManager.State.CONNECTED_LOCAL) def nm_is_connecting(): - """Is NetworkManager connecting?""" + """Is NetworkManager connecting? + + :return: True if NM is in CONNECTING state, False otherwise. + :rtype: bool + """ return nm_state() == NetworkManager.State.CONNECTING def nm_devices(): - """Return list of network device names supported in installer""" + """Return names of network devices supported in installer. + + :return: names of network devices supported in installer + :rtype: list of strings + """ interfaces = [] @@ -145,7 +161,11 @@ def nm_devices(): return interfaces def nm_activated_devices(): - """Return list of names of activated network devices""" + """Return names of activated network devices. + + :return: names of activated network devices + :rtype: list of strings + """ interfaces = [] @@ -185,9 +205,14 @@ def _device_type_specific_interface(device): def nm_device_property(name, prop): """Return value of device NM property - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :param prop: property + :type name: str + :return: value of device's property + :rtype: unpacked GDBus value + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ retval = None @@ -223,75 +248,100 @@ def nm_device_property(name, prop): def nm_device_type_is_wifi(name): """Is the type of device wifi? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is WIFI, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.WIFI def nm_device_type_is_ethernet(name): """Is the type of device ethernet? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is ETHERNET, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.ETHERNET def nm_device_type_is_bond(name): """Is the type of device bond? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is BOND, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.BOND def nm_device_type_is_vlan(name): """Is the type of device vlan? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is VLAN, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.VLAN def nm_device_hwaddress(name): - """Return device's 'HwAddress' property + """Return active hardware address of device ('HwAddress' property) - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: active hardware address of device ('HwAddress' property) + :rtype: str + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'HwAddress' property is not found """ return nm_device_property(name, "HwAddress") def nm_device_type(name): - """Return device's 'DeviceType' property + """Return device's type ('DeviceType' property). - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: device type + :rtype: integer + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'DeviceType' property is not found """ return nm_device_property(name, "DeviceType") def nm_device_carrier(name): - """Return device's 'Carrier' property + """Return whether physical carrier of device is found. + ('Carrier' property) - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: True if physical carrier is found, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'Carrier' property is not found """ return nm_device_property(name, "Carrier") def nm_device_ip_addresses(name, version=4): - """Return list of devices's IP addresses + """Return IP addresses of device in ACTIVATED state. - version=4 - ipv4 addresses - version=6 - ipv6 addresses - - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if ip configuration is not found + :param name: name of device + :type name: str + :param version: version of IP protocol (value 4 or 6) + :type version: int + :return: IP addresses of device, empty list if device is not + in ACTIVATED state + :rtype: list of strings + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if IP configuration is not found """ retval = [] config = nm_device_ip_config(name, version) @@ -303,8 +353,11 @@ def nm_device_ip_addresses(name, version=4): def nm_device_active_ssid(name): """Return ssid of device's active access point. - Exceptions: - UnknownDeviceError if device is not found + :param name: name of device + :type name: str + :return ssid of active access point, None if device has no active AP + :rtype: str + :raise UnknownDeviceError if device is not found """ try: @@ -321,25 +374,20 @@ def nm_device_active_ssid(name): return ssid def nm_device_ip_config(name, version=4): - """Return list of devices's IP config. + """Return IP configurations of device in ACTIVATED state. :param name: name of device :type name: str - :param version: version of IP protocol (value 4 or 6) :type version: int - - :returns: - - Returns: - [[[address1, prefix1, gateway1], [address2, prefix2, gateway2], ...], [nameserver1, nameserver2]] - addressX, gatewayX: string - prefixX: int - [] if device is not in ACTIVATED state - - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if ip configuration is not found + :return: IP configuration of device, empty list if device is not + in ACTIVATED state + :rtype: [[[address1, prefix1, gateway1], [address2, prefix2, gateway2], ...], + [nameserver1, nameserver2]] + addressX, gatewayX: string + prefixX: int + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if ip configuration is not found """ state = nm_device_property(name, "State") if state != NetworkManager.DeviceState.ACTIVATED: @@ -393,10 +441,10 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] def nm_ntp_servers_from_dhcp(): - """Return a list of NTP servers that were specified the reply of the - DHCP server or empty list if no NTP servers were returned. - The return_hostnames parameter specifies if the NTP server IP - addresses from the DHCP reply should be converted to hostnames. + """Return NTP servers obtained by DHCP. + + return: NTP servers obtained by DHCP + rtype: list of str """ ntp_servers = [] # get paths for all actively connected interfaces @@ -419,12 +467,13 @@ def nm_ntp_servers_from_dhcp(): return ntp_servers def _device_settings(name): - """Return object path of device setting - - Returns None if settings were not found. + """Return object path of device setting. - Exceptions: - UnknownDeviceError - device was not found + :param name: name of device + :type name: str + :return: path of settings, None if not found + :rtype: str or None + :raise UnknownDeviceError if device is not found """ devtype = nm_device_type(name) if devtype == NetworkManager.DeviceType.BOND: @@ -444,7 +493,10 @@ def _device_settings(name): def _settings_for_ap(ssid): """Return object path of wireless access point settings. - Returns None if settings were not found. + :param ssid: ssid of access point + :type ssid: str + :return: path of settings, None if not found + :rtype: str or None ` """ return _find_settings(ssid, '802-11-wireless', 'ssid', format_value=lambda ba: "".join(chr(b) for b in ba)) @@ -452,7 +504,10 @@ def _settings_for_ap(ssid): def _settings_for_hwaddr(hwaddr): """Return object path of settings of device specified by hw address. - Returns None if settings were not found. + :param hwaddr: hardware address (uppercase) + :type hwaddr: str + :return: path of settings, None if not found + :rtype: str or None """ return _find_settings(hwaddr, '802-3-ethernet', 'mac-address', format_value=lambda ba: ":".join("%02X" % b for b in ba)) @@ -460,7 +515,17 @@ def _settings_for_hwaddr(hwaddr): def _find_settings(value, key1, key2, format_value=lambda x:x): """Return object path of settings having given value of key1, key2 setting - Returns None if settings were not found. + :param value: required value of setting + :type value: corresponds to dbus type of setting + :param key1: first-level key of setting (eg "connection") + :type key1: str + :param key2: second-level key of setting (eg "uuid") + :type key2: str + :param format_value: function to be called on setting value before + comparing + :type format_value: function taking one argument (setting value) + :return: path of settings, None if not found + :rtype: str or None """ retval = None @@ -495,16 +560,19 @@ def _find_settings(value, key1, key2, format_value=lambda x:x): def nm_device_setting_value(name, key1, key2): """Return value of device's setting specified by key1 and key2. - Return None if the setting is not found which means NM will use - default value for the setting. We can't validate that keys - actually correspond to a setting (see "connection" "autoconnect" - setting). - - Caller should handle None as default value. - - Exceptions: - UnknownDeviceError - device was not found - DeviceSettingsNotFoundError - settings were not found (eg for "wlan0") + :param name: name of device + :type name: str + :param key1: first-level key of setting (eg "connection") + :type key1: str + :param key2: second-level key of setting (eg "uuid") + :type key2: str + :return: value of setting or None if the setting was not found + which means it does not exist or default value is used + by NM + :rtype: unpacked GDBus variant or None + :raise UnknownDeviceError if device is not found + :raise DeviceSettingsNotFoundError if settings were not found + (eg for "wlan0") """ settings_path = _device_settings(name) if not settings_path: @@ -527,9 +595,13 @@ def nm_device_setting_value(name, key1, key2): def nm_activate_device_connection(dev_name, con_uuid): """Activate device with specified connection. - Exceptions: - UnknownDeviceError - device was not found - + :param dev_name: name of device + :type dev_name: str + :param con_uuid: uuid of connection to be activated on device + :type con_uuid: str + :raise UnknownDeviceError if device is not found + :raise UnmanagedDeviceError if device is not managed by NM + or unavailable """ proxy = _get_proxy() @@ -565,15 +637,29 @@ def nm_activate_device_connection(dev_name, con_uuid): def nm_update_settings_of_device(name, new_values): """Update setting of device. - new_values: list of settings to be modified [[key1, key2, value, default_type_str], ...] - The type of value is determined from existing settings of device. If setting for key1, key2 does not exist, default_type_str is used or if None, the type is inferred from the value supplied (string and bool only). - Exceptions: - UnknownDeviceError - device was not found - DeviceSettingsNotFoundError - settings were not found (eg for "wlan0") + :param name: name of device + :type name: str + :param new_values: list of settings with new values and its types + [[key1, key2, value, default_type_str]] + key1: first-level key of setting (eg "connection") + key2: second-level key of setting (eg "uuid") + value: new value + default_type_str: dbus type of new value to be used + if the setting does not already exist; + if None, the type is inferred from + value (string and bool only) + :type new_values: [[key1, key2, value, default_type_str], ...] + key1: str + key2: str + value: + default_type_str: str + :raise UnknownDeviceError if device is not found + :raise DeviceSettingsNotFoundError if settings were not found + (eg for "wlan0") """ settings_path = _device_settings(name) if not settings_path: @@ -583,11 +669,26 @@ def nm_update_settings_of_device(name, new_values): def _update_settings(settings_path, new_values): """Update setting of object specified by settings_path with value. - new_values: list of settings to be modified [[key1, key2, value, default_type_str], ...] - The type of value is determined from existing setting. If setting for key1, key2 does not exist, default_type_str is used or if None, the type is inferred from the value supplied (string and bool only). + + :param settings_path: path of settings object + :type settings_path: str + :param new_values: list of settings with new values and its types + [[key1, key2, value, default_type_str]] + key1: first-level key of setting (eg "connection") + key2: second-level key of setting (eg "uuid") + value: new value + default_type_str: dbus type of new value to be used + if the setting does not already exist; + if None, the type is inferred from + value (string and bool only) + :type new_values: [[key1, key2, value, default_type_str], ...] + key1: str + key2: str + value: + default_type_str: str """ proxy = _get_proxy(object_path=settings_path, interface_name="org.freedesktop.NetworkManager.Settings.Connection") args = None @@ -656,19 +757,43 @@ def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type return GLib.Variant(settings.get_type_string(), (new_settings,)) def nm_ipv6_to_dbus_ay(address): - """Convert ipv6 address from string to list of bytes (ay) for dbus.""" + """Convert ipv6 address from string to list of bytes 'ay' for dbus + + :param address: IPv6 address + :type address: str + :return: address in format 'ay' for NM dbus setting + :rtype: list of bytes + """ return [int(byte, 16) for byte in re.findall('.{1,2}', IPy.IP(address).strFullsize().replace(':', ''))] def nm_ipv4_to_dbus_int(address): - """Convert ipv4 address from string to int for dbus (switched endianess).""" + """Convert ipv4 address from string to int for dbus (switched endianess). + + :param address: IPv4 address + :type address: str + :return: IPv4 address as an integer 'u' for NM dbus setting + :rtype: integer + """ return struct.unpack("=L", socket.inet_aton(address))[0] def nm_dbus_ay_to_ipv6(bytelist): - """Convert ipv6 address from list of bytes (dbus ay) to string.""" + """Convert ipv6 address from list of bytes (dbus 'ay') to string. + + :param address: IPv6 address as list of bytes returned by dbus ('ay') + :type address: list of bytes - dbus 'ay' + :return: IPv6 address + :rtype: str + """ return socket.inet_ntop(socket.AF_INET6, "".join(chr(byte) for byte in bytelist)) def nm_dbus_int_to_ipv4(address): - """Convert ipv4 address from int from dbus (switched endianess) to string.""" + """Convert ipv4 address from dus int 'u' (switched endianess) to string. + + :param address: IPv4 address as integer returned by dbus ('u') + :type address: integer - dbus 'u' + :return: IPv6 address + :rtype: str + """ return socket.inet_ntop(socket.AF_INET, struct.pack('=L', address)) def test(): -- 1.7.11.7

2 1

[master/rhel7] tui ErrorDialog needs to be modal (#983316)
by Brian C. Lane 20 Sep '13

20 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> The dialog waits for any key to be hit, and it needs to be displayed immediately so use a modal screen. --- pyanaconda/packaging/yumpayload.py | 3 ++- pyanaconda/ui/tui/__init__.py | 2 +- pyanaconda/ui/tui/tuiobject.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 5c9bbc1..d9630f9 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1525,7 +1525,8 @@ reposdir=%s except DependencyError as e: if errorHandler.cb(e) == ERROR_RAISE: progressQ.send_quit(1) - sys.exit(1) + while True: + time.sleep(100000) # doPreInstall # create mountpoints for protected device mountpoints (?) diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index cb3e511..c3e8471 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -258,7 +258,7 @@ class TextUserInterface(ui.UserInterface): """Internal helper function that MUST BE CALLED FROM THE MAIN THREAD""" error_window = ErrorDialog(self._app, message) - self._app.switch_screen(error_window) + self._app.switch_screen_modal(error_window) def showDetailedError(self, message, details): return self._show_message_in_main_thread(self._showDetailedError, (message, details)) diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py index e2c96f7..da82909 100644 --- a/pyanaconda/ui/tui/tuiobject.py +++ b/pyanaconda/ui/tui/tuiobject.py @@ -44,6 +44,7 @@ class ErrorDialog(tui.UIScreen): tui.UIScreen.refresh(self, args) text = tui.TextWidget(self._message) self._window.append(tui.CenterWidget(text)) + return True def prompt(self, args = None): return _("Press enter to exit.") @@ -51,6 +52,7 @@ class ErrorDialog(tui.UIScreen): def input(self, args, key): """This dialog is closed by any input.""" self.close() + return None class YesNoDialog(tui.UIScreen): """Dialog screen for Yes - No questions.""" -- 1.8.3.1

2 1

[PATCH] Set the password strength color based on strength (#965596)
by David Shea 20 Sep '13

20 Sep '13

Define styles for GtkLevelBar widgets at the named levels "low", "medium" and "high". Define value offsets for these names in each of the GtkLevelBar widgets we use. --- data/Makefile.am | 8 ++-- data/anaconda-gtk.css | 62 ++++++++++++++++++++++++++++++ pyanaconda/ui/gui/__init__.py | 6 +++ pyanaconda/ui/gui/spokes/lib/passphrase.py | 3 ++ pyanaconda/ui/gui/spokes/password.py | 5 +++ pyanaconda/ui/gui/spokes/user.py | 5 +++ scripts/makeupdates | 2 + 7 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 data/anaconda-gtk.css diff --git a/data/Makefile.am b/data/Makefile.am index 2f66b00..1c08ed2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,10 +21,8 @@ SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts CLEANFILES = *~ -ksdir = $(datadir)/$(PACKAGE_NAME) -dist_ks_DATA = interactive-defaults.ks - -tmuxdir = $(datadir)/$(PACKAGE_NAME) -dist_tmux_DATA = tmux.conf +dist_pkgdata_DATA = interactive-defaults.ks \ + tmux.conf \ + anaconda-gtk.css MAINTAINERCLEANFILES = Makefile.in diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css new file mode 100644 index 0000000..92669ba --- /dev/null +++ b/data/anaconda-gtk.css @@ -0,0 +1,62 @@ +/* Define styles to apply to the GtkLevelBar widgets for different values. + * + * This stylesheet defines properties for "low", "medium" and "high" level bar + * levels. The level bars themselves need to define what style applies at what + * value using gtk_level_bar_add_offset_value. Gtk defines "low" and "high" by + * default, but it defines them for level bars using a continuous value between + * 0 and 1, so our discrete level bars are effectively always at the "high" + * level. + * + * Fun surprises that might change in future versions: + * + * - Defining properties for a level will set properties on both the filled + * portion and the empty portion of the level bar. So if all of the display + * properties are set, which we do, the level bar effectively becomes 100% + * filled with whatever properties are set. Copying the .empty-fill-block + * properties from the theme so that they apply at the application level + * works around this. + * + * - There's a bug in the handling of the maximum offset in that it only + * applies when value == max-value, rather than when it's between + * max-value and the next lower offset. For example, consider a + * discrete-mode level bar with a max-value of 4 and offsets defined as + * "low": 2.0, "medium": 3.0 and "high": 4.0. Value 1 will be low, + * value 2 will be medium, value 3 will be in an undefined no-man's land, + * and value 4 will be high. To get around this we re-define the default + * fill-block values as the same as fill-block.level-high. + * + * - The GNOME Adwaita theme applies a gradient to the progress bar when the + * window is focused. It does this by redefining the colors in a + * background-image property, so unless we reset background-image our colors + * will only apply when the window is out of focus, which uses the :backdrop + * selector. + */ + +@define-color anaconda_level_bar_low red; +@define-color anaconda_level_bar_medium orange; +@define-color anaconda_level_bar_high green; + +.level-bar.fill-block.level-low { + border-color: darker(@anaconda_level_bar_low); + background-color: @anaconda_level_bar_low; + background-image: none; +} + +.level-bar.fill-block.level-medium { + border-color: darker(@anaconda_level_bar_medium); + background-color: @anaconda_level_bar_medium; + background-image: none; +} + +.level-bar.fill-block, +.level-bar.fill-block.level-high { + border-color: darker(@anaconda_level_bar_high); + background-color: @anaconda_level_bar_high; + background-image: none; +} + +.level-bar.fill-block.empty-fill-block { + background-color: transparent; + background-image: none; + border-color: alpha(#000000, 0.1); +} diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 7f18c4b..22270b3 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -624,6 +624,12 @@ class GraphicalUserInterface(UserInterface): settings.set_property("gtk-font-name", "Cantarell") settings.set_property("gtk-icon-theme-name", "gnome") + # Apply the application stylesheet + provider = Gtk.CssProvider() + provider.load_from_path("/usr/share/anaconda/anaconda-gtk.css") + Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + self._currentAction.window.show_all() # Do this at the last possible minute. diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 9c77c18..2cd6887 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -71,6 +71,9 @@ class PassphraseDialog(GUIObject): self._strength_bar.set_mode(Gtk.LevelBarMode.DISCRETE) self._strength_bar.set_min_value(0) self._strength_bar.set_max_value(4) + self._strength_bar.add_offset_value("low", 2) + self._strength_bar.add_offset_value("medium", 3) + self._strength_bar.add_offset_value("high", 4) box = self.builder.get_object("strength_box") box.pack_start(self._strength_bar, False, True, 0) box.show_all() diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py index 55bf116..b828317 100644 --- a/pyanaconda/ui/gui/spokes/password.py +++ b/pyanaconda/ui/gui/spokes/password.py @@ -62,6 +62,11 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke): self.pw_bar = self.builder.get_object("password_bar") self.pw_label = self.builder.get_object("password_label") + # Configure levels for the password bar + self.pw_bar.add_offset_value("low", 2) + self.pw_bar.add_offset_value("medium", 3) + self.pw_bar.add_offset_value("high", 4) + def refresh(self): self.pw.grab_focus() self._checkPassword() diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index 1ee9399..a6fe7a0 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -259,6 +259,11 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): self.pw_bar = self.builder.get_object("password_bar") self.pw_label = self.builder.get_object("password_label") + # Configure levels for the password bar + self.pw_bar.add_offset_value("low", 2) + self.pw_bar.add_offset_value("medium", 3) + self.pw_bar.add_offset_value("high", 4) + # indicate when the password was set by kickstart self._user.password_kickstarted = self.data.user.seen if self._user.password_kickstarted: diff --git a/scripts/makeupdates b/scripts/makeupdates index b49cac6..72b0245 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -259,6 +259,8 @@ def copyUpdatedFiles(tag, updates, cwd): install_to_dir(file, "lib/systemd/system-generators") elif file == "data/tmux.conf": install_to_dir(file, "usr/share/anaconda") + elif file == "data/anaconda-gtk.css": + install_to_dir(file, "usr/share/anaconda") elif file == "data/interactive-defaults.ks": install_to_dir(file, "usr/share/anaconda") elif file == "data/liveinst/liveinst": -- 1.8.3.1

2 1

[PATCH] ProgressHub no longer exists in pyanaconda/ui/tui/hubs.
by Chris Lumens 20 Sep '13

20 Sep '13

--- pyanaconda/ui/tui/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index 31bcff5..f97b0fb 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -27,7 +27,6 @@ from pyanaconda.flags import flags from pyanaconda.threads import threadMgr import simpleline as tui from hubs.summary import SummaryHub -from hubs.progress import ProgressHub from spokes import StandaloneSpoke from tuiobject import YesNoDialog, ErrorDialog @@ -126,7 +125,7 @@ class TextUserInterface(ui.UserInterface): def _list_hubs(self): """returns the list of hubs to use""" - return [SummaryHub, ProgressHub] + return [SummaryHub] def _is_standalone(self, spoke): """checks if the passed spoke is standalone""" -- 1.8.1.2

4 6

[master][PATCH] Keyboard variant names may contain dashes (#1008730)
by Vratislav Podzimek 20 Sep '13

20 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 2 +- tests/pyanaconda_tests/keyboard_test.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 03d988a..e86771a 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -61,7 +61,7 @@ LOCALED_IFACE = "org.freedesktop.locale1" # should match and parse strings like 'cz' or 'cz (qwerty)' regardless of white # space LAYOUT_VARIANT_RE = re.compile(r'^\s*(\w+)\s*' # layout plus - r'(?:(?:$\s*(\w+)\s*$)' # variant in parentheses + r'(?:(?:$\s*([-\w]+)\s*$)' # variant in parentheses r'|(?:$))\s*') # or nothing # namedtuple for information about a keyboard layout (its language and description) diff --git a/tests/pyanaconda_tests/keyboard_test.py b/tests/pyanaconda_tests/keyboard_test.py index ca8aa38..1b8974d 100644 --- a/tests/pyanaconda_tests/keyboard_test.py +++ b/tests/pyanaconda_tests/keyboard_test.py @@ -25,11 +25,15 @@ class ParsingAndJoiningTests(unittest.TestCase): def layout_variant_parsing_test(self): """Should correctly parse keyboard layout and variant string specs.""" - # a valid layout variant spec + # valid layout variant specs layout, variant = keyboard._parse_layout_variant("cz (qwerty)") self.assertEqual(layout, "cz") self.assertEqual(variant, "qwerty") + layout, variant = keyboard._parse_layout_variant("cz (dvorak-ucw)") + self.assertEqual(layout, "cz") + self.assertEqual(variant, "dvorak-ucw") + # a valid layout variant spec with no variant specified layout, variant = keyboard._parse_layout_variant("cz") self.assertEqual(layout, "cz") -- 1.7.11.7

2 2

[PATCH] Fix the password confirmation match check
by David Shea 20 Sep '13

20 Sep '13

The check for whether the password field and the password confirmation field match is run when either field is changed, since changes to either field will cause the state of the match to change. This was working correctly when a change to either field broke the match, but was not always working when a change fixed the match. The check object for the field not changed remained in a failure state, making it impossible to exit the spoke even though the password matched. This fixes that by manually running the check on the field not changed. --- pyanaconda/ui/gui/__init__.py | 11 +++++++++-- pyanaconda/ui/gui/spokes/user.py | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 7f18c4b..f971794 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -98,9 +98,16 @@ class GUICheck(object): self._handler_id = None self._check_status = None - def update_check_status(self, editable=None, data=None): + def update_check_status(self, editable=None, check_data=None): """Run an input validation check.""" - new_check_status = self._run_check(self._editable, self._check_data) + + # Allow check parameters to be overriden in parameters + if editable is None: + editable = self._editable + if check_data is None: + check_data = self._check_data + + new_check_status = self._run_check(editable, check_data) check_status_changed = (self._check_status != new_check_status) self._check_status = new_check_status diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index 1ee9399..dd2d217 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -279,9 +279,13 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): self.add_check(self.pw, self._checkPasswordEmpty, None) # The password confirmation needs to be checked whenever either of the password - # fields change - self.add_check(self.confirm, self._checkPasswordConfirm, None) - self.add_check(self.pw, self._checkPasswordConfirm, None) + # fields change. Separate checks are created on each field so that edits on + # either will trigger a check and so that the last edited field will get the focus + # when Done is clicked. Whichever check is run needs to run the other check in + # order to reset the status. The check_data field is used as a flag to prevent + # infinite recursion. + self._confirm_check = self.add_check(self.confirm, self._checkPasswordConfirm, None) + self._password_check = self.add_check(self.pw, self._checkPasswordConfirm, None) # Keep a reference to this check, since it has to be manually run for the # click Done twice check. @@ -483,16 +487,31 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): else: return None - def _checkPasswordConfirm(self, editable=None, data=None): + def _checkPasswordConfirm(self, editable=None, reset_status=None): """If the user has entered confirmation data, check whether it matches the password.""" + + # This check is triggered by changes to either the password field or the + # confirmation field. If this method is being run from a successful check + # to reset the status, just return success + if reset_status: + return None # Skip the check if no password is required if (not self.usepassword.get_active()) or self._user.password_kickstarted: - return None + result = None elif self.confirm.get_text() and (self.pw.get_text() != self.confirm.get_text()): - return _("The passwords do not match.") + result = _("The passwords do not match.") else: - return None + result = None + + # If the check succeeded, reset the status of the other check object + if result is None: + if editable == self.confirm: + self._password_check.update_check_status(check_data=True) + else: + self._confirm_check.update_check_status(check_data=True) + + return result def _checkPasswordStrength(self, editable=None, data=None): """Update the error message based on password strength. -- 1.8.3.1

2 1

[PATCH rhel6-branch] fcoe: adapt bnx2fc detection to changed sysfs path structure (#1008731)
by Radek Vykydal 19 Sep '13

19 Sep '13

Slightly modified patch by Eddie Wai. --- storage/udev.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/storage/udev.py b/storage/udev.py index e6455c8..78fb996 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -616,7 +616,7 @@ def udev_device_get_iscsi_initiator(info): # This is completely different for Broadcom FCoE devices (bnx2fc), where we use # the sysfs path: -# /devices/pci0000:00/0000:00:02.0/0000:09:00.0/0000:0a:01.0/0000:0e:00.0/host3/rport-3:0-2/target3:0:1/3:0:1:3/block/sdm +# /devices/pci0000:00/0000:00:03.0/0000:04:00.3/net/eth3/ctlr_0/host5/rport-5:0-3/target5:0:1/5:0:1:147/block/sdb # and find whether the host has 'fc_host' and if it the device has a bound # Ethernet interface. @@ -626,7 +626,7 @@ def _detect_broadcom_fcoe(info): if match: sysfs_pci, host = match.groups() if os.access('/sys/%s/%s/fc_host' %(sysfs_pci, host), os.X_OK) and \ - os.access('/sys/%s/net' %(sysfs_pci), os.X_OK): + 'net' in sysfs_pci: return (sysfs_pci, host) return (None, None) @@ -662,10 +662,14 @@ def udev_device_get_fcoe_nic(info): (sysfs_pci, host) = _detect_broadcom_fcoe(info) if (sysfs_pci, host) != (None, None): - net_path = '/sys/%s/net' % sysfs_pci - listdir = os.listdir(net_path) - if len(listdir) > 0 : - return listdir[0] + net, iface = info['sysfs_path'].split("/")[5:7] + if net != "net": + log.warning("unexpected sysfs_path of bnx2fc device: %s" % info['sysfs_path']) + match = re.compile(r'.*/net/([^/]*)').match(info['sysfs_path']) + if match: + return match.groups()[0] + else: + return iface def udev_device_get_fcoe_identifier(info): path = info.get("ID_PATH", "") -- 1.7.11.7

2 1

[PATCH] Behave better when PYTHONPATH is already set
by David Shea 18 Sep '13

18 Sep '13

Append to $PYTHONPATH rather than replacing it. Use $top_srcdir rather than $PYTHONPATH to detect whether automake has already set up the test environment. --- tests/nosetests.sh | 9 +++------ tests/pylint/runpylint.sh | 10 +++++----- tests/testenv.sh | 8 ++++++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/nosetests.sh b/tests/nosetests.sh index 1ad86c0..e0b1c1e 100755 --- a/tests/nosetests.sh +++ b/tests/nosetests.sh @@ -1,11 +1,8 @@ #!/bin/sh -# Use the directory above the one containing the script as the default for -# $top_srcdir -: "${top_srcdir:=$(dirname "$0")/..}" - -# If no PYTHONPATH is set, import the test environment -if [ -z "$PYTHONPATH" ]; then +# If $top_srcdir has not been set by automake, import the test environment +if [ -z "$top_srcdir" ]; then + top_srcdir="$(dirname "$0")/.." . ${top_srcdir}/tests/testenv.sh fi diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 6fe1b6c..af4183e 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -15,14 +15,14 @@ if [ -z "$top_srcdir" ]; then pylint_log=1 fi -: "${top_srcdir:=$(dirname "$0")/../..}" -srcdir="${top_srcdir}/tests/pylint" - -# If no PYTHONPATH is set, import the test environment -if [ -z "$PYTHONPATH" ]; then +# If $top_srcdir has not been set by automake, import the test environment +if [ -z "$top_srcdir" ]; then + top_srcdir="$(dirname "$0")/../.." . ${top_srcdir}/tests/testenv.sh fi +srcdir="${top_srcdir}/tests/pylint" + FALSE_POSITIVES="${srcdir}"/pylint-false-positives # W0212 - Access to a protected member %s of a client class diff --git a/tests/testenv.sh b/tests/testenv.sh index b4749b4..1568644 100644 --- a/tests/testenv.sh +++ b/tests/testenv.sh @@ -5,10 +5,14 @@ if [ -z "$top_srcdir" ]; then exit 1 fi -# If not top_builddir is set, use top_srcdir +# If no top_builddir is set, use top_srcdir : "${top_builddir:=$top_srcdir}" -PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +if [ -z "$PYTHONPATH" ]; then + PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +else + PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +fi export PYTHONPATH export top_srcdir export top_builddir -- 1.8.3.1

2 1

[PATCH] Check the validity of generated usernames in TUI (#965543)
by David Shea 18 Sep '13

18 Sep '13

--- pyanaconda/ui/tui/spokes/user.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py index 6185f80..6ece776 100644 --- a/pyanaconda/ui/tui/spokes/user.py +++ b/pyanaconda/ui/tui/spokes/user.py @@ -108,7 +108,9 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke): def apply(self): if self.args.gecos and not self.args.name: - self.args.name = guess_username(self.args.gecos) + username = guess_username(self.args.gecos) + if USERNAME_VALID.match(username): + self.args.name = guess_username(self.args.gecos) self.args.groups = [g.strip() for g in self.args._groups.split(",") if g] -- 1.8.3.1

2 1

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013