Fix the update script so we don't write any dupes.

Signed-off-by: Steven Black <redacted>

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 1c283a4d9074b8fe22817c3ab05465a21eb233f9..82e151d51507e3b71a786753390a783cb27096aa 100644 (file)
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -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