Just for thoroughness. Here's the final patch that seems to be working. Diane
Author: Michael Biebl <bi...@debian.org>
Description: libnm-glib/libnm-util has been deprecated upstream in favour of libnm.
--- a/dnssec-trigger-script.in
+++ b/dnssec-trigger-script.in
@@ -18,9 +18,9 @@
import signal
import gi
-gi.require_version('NMClient', '1.0')
+gi.require_version('NM', '1.0')
-from gi.repository import NMClient
+from gi.repository import NM
# Python compatibility stuff
if not hasattr(os, "O_CLOEXEC"):
@@ -132,7 +132,7 @@
def __init__(self, client, only_default=False, only_vpn=False, skip_wifi=False):
# Cache the active connection list in the class
- if not client.get_manager_running():
+ if not client.get_nm_running():
raise UserError("NetworkManager is not running.")
if self.nm_connections is None:
self.__class__.nm_connections = client.get_active_connections()
@@ -219,30 +219,17 @@
self.servers = []
try:
- self.servers += [self.ip4_to_str(server) for server in connection.get_ip4_config().get_nameservers()]
+ self.servers += connection.get_ip4_config().get_nameservers()
except AttributeError:
pass
try:
- self.servers += [self.ip6_to_str(connection.get_ip6_config().get_nameserver(i))
- for i in range(connection.get_ip6_config().get_num_nameservers())]
+ self.servers += connection.get_ip6_config().get_nameservers()
except AttributeError:
pass
def __repr__(self):
return "<Connection(uuid={uuid}, type={type}, default={is_default}, zones={zones}, servers={servers})>".format(**vars(self))
- @staticmethod
- def ip4_to_str(ip4):
- """Converts IPv4 address from integer to string."""
-
- return socket.inet_ntop(socket.AF_INET, struct.pack("=I", ip4))
-
- @staticmethod
- def ip6_to_str(ip6):
- """Converts IPv6 address from integer to string."""
-
- return socket.inet_ntop(socket.AF_INET6, ip6)
-
@property
def ignore(self):
return self.type == "ignore"
@@ -466,10 +453,10 @@
except AttributeError:
self.usage()
- self.client = NMClient.Client().new()
+ self.client = NM.Client().new()
def nm_handles_resolv_conf(self):
- if not self.client.get_manager_running():
+ if not self.client.get_nm_running():
log.debug("NetworkManager is not running")
return False
try:
signature.asc
Description: This is a digitally signed message part
