Attachment 10645 Details for Bug 52919

[patch] Proposed patch

commit-ee01830 (text/plain), 1.89 KB, created by Jürn Brodersen on 2021-03-16 11:19 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Jürn Brodersen

Created: 2021-03-16 11:19 CET

Size: 1.89 KB

patch

obsolete

>From ee01830ce2020705b8a65619a8261eae267efa0a Mon Sep 17 00:00:00 2001
>From: JÃ¼rn Brodersen <brodersen@univention.de>
>Date: Mon, 15 Mar 2021 13:13:08 +0100
>Subject: fix traceback:
>
>Multifile: /etc/hosts
>Traceback (most recent call last):
>  File "<stdin>", line 41, in <module>
>  TypeError: '<' not supported between instances of 'str' and 'NoneType'
>
>diff --git a/base/univention-base-files/conffiles/etc/hosts.d/00-base b/base/univention-base-files/conffiles/etc/hosts.d/00-base
>index 08b446bcaf..aa440289b8 100644
>--- a/base/univention-base-files/conffiles/etc/hosts.d/00-base
>+++ b/base/univention-base-files/conffiles/etc/hosts.d/00-base
>@@ -21,9 +21,9 @@ for key, value in configRegistry.items():
> 		hosts = configRegistry.get(key, default_hosts)
> 		if hosts:
> 			if iface == primary:
>-				primary_entries.append((iface, None, '%s\t%s' % (value, hosts)))
>+				primary_entries.append((iface, 4, '', '%s\t%s' % (value, hosts)))
> 			else:
>-				entries.append((iface, None, '%s\t%s' % (value, hosts)))
>+				entries.append((iface, 4, '', '%s\t%s' % (value, hosts)))
> 	match = RE_IPV6.match(key)
> 	if match:
> 		(iface, name) = match.groups()
>@@ -33,11 +33,11 @@ for key, value in configRegistry.items():
> 			if name == 'default':
> 				name = ''
> 			if iface == primary:
>-				primary_entries.append((iface, name, '%s\t%s' % (value, hosts)))
>+				primary_entries.append((iface, 6, name, '%s\t%s' % (value, hosts)))
> 			else:
>-				entries.append((iface, name, '%s\t%s' % (value, hosts)))
>-for (iface, name, line) in sorted(primary_entries):  # IPv4 < IPv6.default < IPv6.*
>+				entries.append((iface, 6, name, '%s\t%s' % (value, hosts)))
>+for (iface, ip_version, name, line) in sorted(primary_entries):  # IPv4 < IPv6.default < IPv6.*
> 	print(line)
>-for (iface, name, line) in sorted(entries):  # IPv4 < IPv6.default < IPv6.*
>+for (iface, ip_version, name, line) in sorted(entries):  # IPv4 < IPv6.default < IPv6.*
> 	print(line)
> @!@

Actions: View | Diff

Attachments on bug 52919: 10645