]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/fireinfo/0005-Fix-crash-if-there-is-id-has-already-been-reset-to-N.patch
Merge remote-tracking branch 'ms/ipsec-subnets' into next
[ipfire-2.x.git] / src / patches / fireinfo / 0005-Fix-crash-if-there-is-id-has-already-been-reset-to-N.patch
1 From deafec982e4c8f2e6ffa3bf70b0a94fa30158e9a Mon Sep 17 00:00:00 2001
2 From: Michael Tremer <michael.tremer@ipfire.org>
3 Date: Wed, 9 Sep 2015 15:04:43 +0100
4 Subject: [PATCH 5/5] Fix crash if there is id has already been reset to None
5
6 Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
7 ---
8 src/fireinfo/system.py | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11 diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
12 index edf7359a17e6..c2ba12e818f0 100644
13 --- a/src/fireinfo/system.py
14 +++ b/src/fireinfo/system.py
15 @@ -256,7 +256,7 @@ class System(object):
16 break
17
18 # Check if the string only contains 0xff
19 - if all((e == "\xff" for e in id)):
20 + if id and all((e == "\xff" for e in id)):
21 id = None
22
23 if id:
24 --
25 2.4.3
26