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

core: backport fix for missing braces bug in platform

Browse Source 
It's only beta1, but it breaks compilation for rawhide due
to -Werror=misleading-indentation.
This commit is contained in:
Thomas Haller 2016-02-03 16:47:36 +01:00
parent 98b39fff30
commit 180858e3be
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-platform-statement-braces.patch Normal file
View File

@ -0,0 +1,33 @@
From e119ce167d8c220eb743f2c26e6dbaafdac5c16a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 21 Jan 2016 16:53:56 +0100
Subject: [PATCH 1/1] linux-platform: fix accidental Python
Coverity: CID 59378 (#1 of 1): Nesting level does not match indentation
(NESTING_INDENT_MISMATCH) This statement is indented to column 41, as if
it were nested within the preceding parent statement, but it is not.
(cherry picked from commit 88da21caa156b30cb1cf62a930770e60c89b86a8)
---
src/platform/nm-linux-platform.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index f73c228..ea2d5d3 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -5728,9 +5728,10 @@ after_read:
i++;
if ( data_next.seq_number == 0
- || data_next.timeout_abs_ns > data->timeout_abs_ns)
+ || data_next.timeout_abs_ns > data->timeout_abs_ns) {
data_next.seq_number = data->seq_number;
data_next.timeout_abs_ns = data->timeout_abs_ns;
+ }
}
}
--
2.5.0

3
NetworkManager.spec
View File

@ -92,6 +92,7 @@ Source2: 00-server.conf
Source3: 20-connectivity-fedora.conf Source3: 20-connectivity-fedora.conf
#Patch1: 0001-some.patch #Patch1: 0001-some.patch
Patch1: 0001-platform-statement-braces.patch
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
@ -331,6 +332,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%setup -q -n NetworkManager-%{real_version} %setup -q -n NetworkManager-%{real_version}
#%patch1 -p1 #%patch1 -p1
%patch1 -p1
%build %build
@ -637,6 +639,7 @@ fi
%changelog %changelog
* Wed Feb 3 2016 Thomas Haller <thaller@redhat.com> - 1:1.2.0-0.6.beta1 * Wed Feb 3 2016 Thomas Haller <thaller@redhat.com> - 1:1.2.0-0.6.beta1
- specfile: remove no longer needed 10-ibft-plugin.conf and sync with contrib/rpm - specfile: remove no longer needed 10-ibft-plugin.conf and sync with contrib/rpm
- core: backport fix for missing braces bug in platform
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.0-0.5.beta1.1 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.0-0.5.beta1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild