Merge branch '4.9'

This commit is contained in:
Rohit Yadav 2016-08-22 16:36:24 +05:30
commit 3c2e8b9294

View File

@ -107,10 +107,10 @@ def main():
apiMap = {}
with open(options.commandsfile) as f:
for line in f.readlines():
if not line or line == '' or line == '\n' or line.startswith('#'):
if not line or line == '' or line == '\n' or line == '\r\n' or line.startswith('#'):
continue
name, value = line.split('=')
apiMap[name.strip()] = value.strip()
apiMap[name.strip()] = value.strip().split(';')[-1]
# Rename and deprecate old commands.properties file
if not dryrun: