Attachment 889789 Details for Bug 1091434 – proposed patch

proposed patch

0001-network-fix-device-configuration-in-text-mode-109143.patch (text/plain), 1.83 KB, created by Radek Vykydal on 2014-04-25 15:17:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2014-04-25 15:17:10 UTC

Size: 1.83 KB

patch

obsolete

>From cf989ec2f7b59f5467563c596e665bd50f605b07 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Fri, 25 Apr 2014 15:20:00 +0200
>Subject: [PATCH rhel7-branch] network: fix device configuration in text mode (#1091434)
>
>Resolves: rhbz#1091434
>
>This is caused by commit 31b7dfbe5969c9d35daa5579361ea66e0fb2f6d2.
>We want to update all settings, not only the last one in the loop.
>---
> pyanaconda/nm.py | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
>index bc73cde..cd30442 100644
>--- a/pyanaconda/nm.py
>+++ b/pyanaconda/nm.py
>@@ -771,9 +771,13 @@ def _update_settings(settings_path, new_values):
>                                DEFAULT_DBUS_TIMEOUT,
>                                None)
>     for key1, key2, value, default_type_str in new_values:
>-        new_settings = _gvariant_settings(settings, key1, key2, value, default_type_str)
>+        settings = _gvariant_settings(settings, key1, key2, value, default_type_str)
> 
>-    proxy.Update(settings.get_type_string(), new_settings)
>+    proxy.call_sync("Update",
>+                    settings,
>+                    Gio.DBusCallFlags.NONE,
>+                    DEFAULT_DBUS_TIMEOUT,
>+                    None)
> 
> def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type_str=None):
>     """Update setting of updated_key1, updated_key2 of settings object with value.
>@@ -823,7 +827,7 @@ def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type
>             new_settings[updated_key1] = {}
>         new_settings[updated_key1][updated_key2] = GLib.Variant(type_str, value)
> 
>-    return new_settings
>+    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."""
>-- 
>1.7.11.7
>

Actions: View

Attachments on bug 1091434: 889789