From 513bdd1ce80df0c404807e1063806abd1dbe0e1c Mon Sep 17 00:00:00 2001 From: Steven Black Date: Tue, 23 Feb 2016 09:50:20 -0500 Subject: [PATCH] Only process source folders, and not files that may be present. --- updateHostsFile.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/updateHostsFile.py b/updateHostsFile.py index 4b58f47e8..1c6130dc1 100644 --- a/updateHostsFile.py +++ b/updateHostsFile.py @@ -61,7 +61,6 @@ def myInput(msg = ""): else: return raw_input(msg) - # Cross-python writing function def writeData(f, data): if Python3: @@ -212,21 +211,22 @@ def matchesExclusions(strippedRule): def updateAllSources(): allsources = list(set(SOURCES) | set(EXTENSIONS)) for source in allsources: - updateURL = getUpdateURLFromFile(source) - if updateURL is None: - continue - print ("Updating source " + os.path.basename(source) + " from " + updateURL) - # Cross-python call - updatedFile = getFileByUrl(updateURL) + if os.path.isdir(source): + updateURL = getUpdateURLFromFile(source) + if updateURL is None: + continue + print ("Updating source " + os.path.basename(source) + " from " + updateURL) + # Cross-python call + updatedFile = getFileByUrl(updateURL) - try: - updatedFile = updatedFile.replace('\r', '') #get rid of carriage-return symbols - # This is cross-python code - dataFile = open(os.path.join(DATA_PATH, source, DATA_FILENAMES), 'wb') - writeData(dataFile, updatedFile) - dataFile.close() - except: - print ("Skipping.") + try: + updatedFile = updatedFile.replace('\r', '') #get rid of carriage-return symbols + # This is cross-python code + dataFile = open(os.path.join(DATA_PATH, source, DATA_FILENAMES), 'wb') + writeData(dataFile, updatedFile) + dataFile.close() + except: + print ("Skipping.") def getUpdateURLFromFile(source): pathToUpdateFile = os.path.join(DATA_PATH, source, UPDATE_URL_FILENAME)