From: qqo <redacted>
Date: Fri, 23 Oct 2015 22:43:18 +0000 (+0300)
Subject: 'suffix' in regex matches empty string on all the data files, except
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=10c4449774262de5079b344b0153115529be356d;p=stevenblack-hosts.git

'suffix' in regex matches empty string on all the data files, except
one (incorrect) line containing port:
0.0.0.0 telemetry.appex.bing.net:443
The resulting entry in hosts file generated like this:
0.0.0.0 telemetry.appex.bing.net :443
which is incorrect. The bug was not spotted only because the incorrect
line in the data source was after the correct line without port,
thus it was ignored and not added to resulting hosts file.
---

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 2108a4f78..63af4e7e0 100755
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -189,7 +189,11 @@ def normalizeRule(rule):
 	if result:
 		target, hostname, suffix = result.groups()
 		hostname = hostname.lower() # explicitly lowercase hostname
-		return hostname, "%s %s %s\n" % (TARGET_HOST, hostname, suffix)
+		if suffix is not '':
+			# add suffix as comment only, not as a separate host
+			return hostname, "%s %s #%s\n" % (TARGET_HOST, hostname, suffix)
+		else:
+			return hostname, "%s %s\n" % (TARGET_HOST, hostname)
 	print '==>%s<==' % rule
 	return None, None