mirror of
https://github.com/StevenBlack/hosts.git
synced 2026-07-01 02:36:52 +00:00
Fix the update script so we don't write any dupes.
Signed-off-by: Steven Black <steveb@stevenblack.com>
This commit is contained in:
@@ -173,12 +173,10 @@ def removeDups(mergeFile):
|
||||
continue
|
||||
hostname, normalizedRule = normalizeRule(strippedRule) # normalize rule
|
||||
|
||||
if normalizedRule and hostname not in hostnames:
|
||||
if normalizedRule and (hostname not in hostnames):
|
||||
finalFile.write(normalizedRule)
|
||||
hostnames.add(hostname)
|
||||
numberOfRules += 1
|
||||
else:
|
||||
finalFile.write(line)
|
||||
|
||||
mergeFile.close()
|
||||
|
||||
@@ -188,7 +186,7 @@ def normalizeRule(rule):
|
||||
result = re.search(r'^[ \t]*(\d+\.\d+\.\d+\.\d+)\s+([\w\.-]+)(.*)',rule)
|
||||
if result:
|
||||
target, hostname, suffix = result.groups()
|
||||
return hostname, "%s\t%s%s\n" % (TARGET_HOST, hostname, suffix)
|
||||
return hostname, "%s %s %s\n" % (TARGET_HOST, hostname, suffix)
|
||||
print '==>%s<==' % rule
|
||||
return None, None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user