From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] unbound-dhcp-leases-bridge: Migrate to Python 3
Date: Fri, 14 May 2021 14:08:14 +0100
Message-ID: <3F0D5E48-8BE2-46CB-AB49-28032298009C@ipfire.org>
In-Reply-To: <7ca3ab7e-6df8-9461-bd7d-f64f782f9731@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0241854236554871752=="
List-Id: <development.lists.ipfire.org>

--===============0241854236554871752==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Yeah, forget this patch :)

Thanks for finding this problem.

> On 14 May 2021, at 14:01, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wr=
ote:
>=20
> Hello Michael,
>=20
> um, isn't it necessary to update the shebang of this script as well?
>=20
> Apart from that:
>=20
> Acked-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>=20
> Thanks, and best regards,
> Peter M=C3=BCller
>=20
>=20
>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>> ---
>> config/unbound/unbound-dhcp-leases-bridge | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>=20
>> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/un=
bound-dhcp-leases-bridge
>> index e3da4860b..2d8ef1387 100644
>> --- a/config/unbound/unbound-dhcp-leases-bridge
>> +++ b/config/unbound/unbound-dhcp-leases-bridge
>> @@ -178,8 +178,8 @@ class UnboundDHCPLeasesBridge(object):
>>=20
>> 		# Dump everything in the logs
>> 		log.debug("Static hosts:")
>> -		for hostname, addresses in hosts.items():
>> -			log.debug("  %-20s : %s" % (hostname, ", ".join(addresses)))
>> +		for name in hosts:
>> +			log.debug("  %-20s : %s" % (name, ", ".join(hosts[name])))
>>=20
>> 		return hosts
>>=20
>> @@ -402,9 +402,9 @@ class Lease(object):
>>=20
>> 		address =3D ipaddress.ip_address(self.ipaddr)
>>=20
>> -		for subnet, domain in subnets.items():
>> +		for subnet in subnets:
>> 			if address in subnet:
>> -				return domain
>> +				return subnets[subnet]
>>=20
>> 		# Fall back to localdomain if no match could be found
>> 		return "localdomain"
>>=20


--===============0241854236554871752==--