rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix activating connections in some cases (rh #1316488)

Browse Source
This commit is contained in:
Dan Williams 2016-03-17 15:56:07 -05:00
parent de82b42eba
commit f561df45ac
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-device-fix-handling-of-available-connections.patch Normal file
View File

@ -0,0 +1,44 @@
From ca5da5d80f3a21847bb807021e2e40d25bca50d0 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Fri, 11 Mar 2016 15:36:35 +0100
Subject: [PATCH] device: fix handling of available connections
The prune list is for elements that must be deleted from the list of
available connections. So, when processing all the existing
connections an element must be deleted from the prune list iff it's
available.
Fixes: 8b2abe0e2c8f162544a2562fc18a7becbc55d233
https://bugzilla.redhat.com/show_bug.cgi?id=1316488
---
src/devices/nm-device.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 51a84bf..f4e2ce1 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -9664,14 +9664,13 @@ nm_device_recheck_available_connections (NMDevice *self)
connection = NM_CONNECTION (iter->data);
if (nm_device_check_connection_available (self,
- connection,
- NM_DEVICE_CHECK_CON_AVAILABLE_NONE,
- NULL)) {
+ connection,
+ NM_DEVICE_CHECK_CON_AVAILABLE_NONE,
+ NULL)) {
if (available_connections_add (self, connection))
changed = TRUE;
- } else {
- if (prune_list && g_hash_table_remove (prune_list, connection))
- changed = TRUE;
+ if (prune_list)
+ g_hash_table_remove (prune_list, connection);
}
}
--
2.5.0

8
NetworkManager.spec
View File

@ -7,7 +7,7 @@
%global ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
%global snapshot .beta2
%global snapshot .beta2.1
%global git_sha %{nil}
%global rpm_version 1.2.0
%global real_version 1.1.91
@ -162,6 +162,8 @@ BuildRequires: dbus-python
BuildRequires: libselinux-devel
BuildRequires: polkit-devel
Patch0: 0001-device-fix-handling-of-available-connections.patch
%description
NetworkManager is a system service that manages network interfaces and
@ -333,6 +335,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%setup -q -n NetworkManager-%{real_version}
#%patch1 -p1
%patch0 -p1 -b .available-connections
%build
@ -630,6 +633,9 @@ fi
%endif
%changelog
* Thu Mar 17 2016 Dan Williams <dcbw@redhat.com> - 1:1.2.0-0.6.beta2.1
- Fix activating connections in some cases (rh #1316488)
* Tue Mar 1 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-0.6.beta2
- Update to NetworkManager 1.2-beta2
- Resync with contrib/rpm