From 0cfe651e00487b0369db91144a283f01a6ae3127 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Mon, 9 Aug 2021 08:57:43 +0200
Subject: [PATCH] Cleanup some networkmanager strangeness
---
src/hostinfo.py | 6 +-----
src/hostinfo/networkmanager.py | 7 +++++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/hostinfo.py b/src/hostinfo.py
index be3ec33..9f45fdc 100755
--- a/src/hostinfo.py
+++ b/src/hostinfo.py
@@ -8,11 +8,7 @@ import hostinfo.ifconfig
import hostinfo.macosx_auto
import hostinfo.mio
import hostinfo.named
-try:
- import hostinfo.networkmanager
-except Exception as e:
- print("Ignored:", e)
- pass
+import hostinfo.networkmanager
import hostinfo.parser
import hostinfo.pxelinux
import hostinfo.role
diff --git a/src/hostinfo/networkmanager.py b/src/hostinfo/networkmanager.py
index 1dfd762..170c90d 100644
--- a/src/hostinfo/networkmanager.py
+++ b/src/hostinfo/networkmanager.py
@@ -1,4 +1,7 @@
-import NetworkManager
+try:
+ import NetworkManager
+except:
+ pass
import dbus
import hostinfo.util as util
import re
@@ -16,7 +19,6 @@ class Network(object):
def __init__(self):
self._networks = {}
- self.reload()
pass
def reload(self):
@@ -71,6 +73,7 @@ class Network(object):
# pprint(self._connection)
def parse_tree(self, tree):
+ self.reload()
for s in filter(util.network, tree._subnet_):
self._networks[util.network(s)] = s
pass
--
GitLab