Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-02 18:45:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deletion of the extra \n after each (and especially commented) line.

Browse Source 
This patch partially fix StevenBlack/hosts#777 .
This commit is contained in:
funilrys 2018-09-13 09:16:40 +02:00
parent 91b2240ff6
commit ec362d81c5
No known key found for this signature in database
GPG Key ID: 0D8BFEF5515C00C6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
updateHostsFile.py
View File

@ -628,8 +628,8 @@ def create_initial_file():
for source in recursive_glob(settings["datapath"],
settings["hostfilename"]):
start = "# Start {}\n".format(os.path.basename(os.path.dirname(source)))
end = "# End {}\n".format(os.path.basename(os.path.dirname(source)))
start = "# Start {}\n\n".format(os.path.basename(os.path.dirname(source)))
end = "# End {}\n\n".format(os.path.basename(os.path.dirname(source)))
with open(source, "r") as curFile:
write_data(merge_file, start + curFile.read() + end)
@ -772,7 +772,7 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
line = line.replace("\t+", " ")
# see gh-271: trim trailing whitespace, periods
line = line.rstrip(' .') + "\n"
line = line.rstrip(' .')
# Testing the first character doesn't require startswith
if line[0] == "#" or re.match(r'^\s*$', line[0]):