anaconda-patches June 2015

anaconda-patches@lists.fedorahosted.org

13 participants
265 discussions

Updated: [rhinstaller/blivet/pulls/132 master] Make use of /usr/bin/env python to avoid hard-coding the python version
by dashea 01 Jun '15

01 Jun '15

* replaces /usr/bin/python with /usr/bin/env python inside test cases. NOTE: I don't see any executable tests/*.py files but maybe this is a good measure. Otherwise this line doesn't have any effect and can be removed. There are still a few places which use hard-coded python version: * Makefile uses PYTHON=python2 which is used in a few places calling setup.py * some scripts/ use /usr/bin/python explicitly * runpylint.py uses /usr/bin/python3 explicitly -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/132

1 4

Updated: [rhinstaller/blivet/pulls/128 master] Include automatic and manual test documentation.
by dashea 01 Jun '15

01 Jun '15

This is my first attempt to bring some test documentation to blivet before actually trying to write any more tests. Summary of changes: - modify existing Makefile target to include test documentation in the main document - add dependency on Graphviz which is used to create inheritance graphs for test cases (used to outline which are the base test classes in Blivet). WARNING: may break Red The Docs if they don't have graphviz installed. Possibly needs a BuildRequires change for the spec file as well. - update .gitignore - add tests/README.rst with basic description of blivet's test suite. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/128

1 2

KS tests: lang and kbd
by Samantha N. Bueno 01 Jun '15

01 Jun '15

Commit msgs contain some more detail, but these are just some basic tests for lang and keyboard settings. Unfortunately I have not discovered a way to test additional lang support, or additional keyboard settings. So if anyone has suggestions, let me know please. Oh, also a small patch to fix a typo.

3 6

[RHEL7-BRANCH] Fix Issue with Spaces in Network IPs and Bad Input(RHBZ#1174451)
by Robert Marshall 01 Jun '15

01 Jun '15

From: Jiri Konecny <jkonecny(a)redhat.com> This Robert Marshall's cherry pick of Jiri Konecny's original patches to master with the following commit IDs: 9371221734c57430829056ac5fc38dedaeeff727 d2e7ea401f86dbe8717cd169dc0051c934c6fcfd The goal of his patch was to fix a bad warning message, however, it also as a side effect resolves an issue where placing a space into a nameserver IP address would cause the installer to crash. This patch also verifies IPv4 and IPv6 addresses in general. The cherry pick removed the pieces of the original patch that applied to the password policy present code in the current master that are not in the RHEL 7 codebase. Resolves RHBZ#1174451 --- pyanaconda/network.py | 12 +++++++++--- pyanaconda/ui/tui/spokes/__init__.py | 10 ++++++++-- pyanaconda/ui/tui/spokes/network.py | 22 +++++++++++++++++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index fb6f3dd..3c2afc9 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -87,6 +87,10 @@ def check_ip_address(address, version=None): return False if version and version == ver: return True + elif not version: + return True + else: + return False def sanityCheckHostname(hostname): """ @@ -437,11 +441,13 @@ def _get_ip_setting_values_from_ksdata(networkdata): nss4 = [] nss6 = [] if networkdata.nameserver: - for ns in networkdata.nameserver.split(","): - if ":" in ns: + for ns in [str.strip(i) for i in networkdata.nameserver.split(",")]: + if check_ip_address(ns, version=6): nss6.append(nm.nm_ipv6_to_dbus_ay(ns)) - else: + elif check_ip_address(ns, version=4): nss4.append(nm.nm_ipv4_to_dbus_int(ns)) + else: + log.error("IP address %s is not valid", ns) values.append(["ipv4", "dns", nss4, "au"]) values.append(["ipv6", "dns", nss6, "aay"]) diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py index 4f72600..a7d49a9 100644 --- a/pyanaconda/ui/tui/spokes/__init__.py +++ b/pyanaconda/ui/tui/spokes/__init__.py @@ -109,6 +109,9 @@ class EditTUIDialog(NormalTUISpoke): NormalTUISpoke.__init__(self, app, data, storage, payload, instclass) self.value = None + # Added to allow custom incorrect input messages + self.wrong_input_message = None + def refresh(self, args = None): self._window = [] self.value = None @@ -168,8 +171,11 @@ class EditTUIDialog(NormalTUISpoke): self.close() return True else: - print(_("You have provided an invalid username: %s\n" - "Tip: Keep your username shorter than 32 characters and do not use spaces.\n") % key) + if self.wrong_input_message: + print(self.wrong_input_message) + else: + print(_("You have provided an invalid user name: %s\n" + "Tip: Keep your user name shorter than 32 characters and do not use spaces.\n") % key) return NormalTUISpoke.input(self, entry, key) class OneShotEditTUIDialog(EditTUIDialog): diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index 9bd47b9..5c332ed 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -253,6 +253,20 @@ class Fake_RE_IPV6(object): return False return network.check_ip_address(addr, version=6) +class Fake_RE_Nameservers(object): + def __init__(self, separator): + self._separator = separator + + def match(self, value): + addresses = [str.strip(i) for i in value.split(self._separator)] + if not addresses: + return False + + for ip in addresses: + if not network.check_ip_address(ip): + return False + return True + class ConfigureNetworkSpoke(EditTUISpoke): """ Spoke to set various configuration options for net devices. """ title = N_("Device configuration") @@ -260,14 +274,15 @@ class ConfigureNetworkSpoke(EditTUISpoke): edit_fields = [ Entry(N_('IPv4 address or %s for DHCP') % '"dhcp"', "ip", - re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "|dhcp$"), True), + re.compile("^(?:" + IPV4_PATTERN_WITHOUT_ANCHORS + "|dhcp)$"), True), Entry(N_("IPv4 netmask"), "netmask", re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "$"), True), Entry(N_("IPv4 gateway"), "gateway", re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "$"), True), Entry(N_('IPv6 address or %(auto)s for automatic, %(dhcp)s for DHCP, %(ignore)s to turn off') % {"auto": '"auto"', "dhcp": '"dhcp"', "ignore": '"ignore"'}, "ipv6", Fake_RE_IPV6(allow_prefix=True, whitelist=["auto", "dhcp", "ignore"]), True), - Entry(N_("IPv6 default gateway"), "ipv6gateway", re.compile(".*$"), True), - Entry(N_("Nameservers (comma separated)"), "nameserver", re.compile(".*$"), True), + Entry(N_("IPv6 default gateway"), "ipv6gateway", Fake_RE_IPV6(), True), + Entry(N_("Nameservers (comma separated)"), "nameserver", + Fake_RE_Nameservers(separator=","), True), Entry(N_("Connect automatically after reboot"), "onboot", EditTUISpoke.CHECK, True), Entry(N_("Apply configuration in installer"), "_apply", EditTUISpoke.CHECK, True), ] @@ -280,6 +295,7 @@ class ConfigureNetworkSpoke(EditTUISpoke): if self.args.noipv6: self.args.ipv6 = "ignore" self.args._apply = False + self.dialog.wrong_input_message = _("Bad format of the IP address") def refresh(self, args=None): """ Refresh window. """ -- 1.8.3.1

3 2

[blivet][rhel7-branch] rebase followups
by David Lehman 01 Jun '15

01 Jun '15

Patches 1-3 are for switch to python-pyudev. Patch 4 splits devices.py into devices package. Patch 5 switches from transifex to zanata. Patches 6-10 are for rc-release builds. Patches 11,12 are required changes. Patch 13 is just low-hanging pylint fruit. bcl, clumens, do we want/need the rc-release/mock stuff on rhel7-branch? I have tested this by installing a scratch build in a freshly- installed 7.1 vm and running the examples shipped with blivet.

3 15

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches June 2015