mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Handle blank lines correctly in addons.conf

Browse Source 
Ticket: (Reported by gospo)
Reviewed By:
Testing Done: Tested with blank lines in the file
This commit is contained in:
Roopa Prabhu
2015-01-22 12:56:56 -08:00
parent a53e80bca9
commit 7bbc934097
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ifupdown/ifupdownmain.py
View File

@@ -554,10 +554,16 @@ class ifupdownMain(ifupdownBase):
with open(self.addon_modules_configfile, 'r') as f: with open(self.addon_modules_configfile, 'r') as f:
lines = f.readlines() lines = f.readlines()
for l in lines: for l in lines:
litems = l.rstrip(' \n\t\r').split(',') try:
litems = l.strip(' \n\t\r').split(',')
if not litems or len(litems) < 2:
continue
operation = litems[0] operation = litems[0]
mname = litems[1] mname = litems[1]
self.module_ops[operation].append(mname) self.module_ops[operation].append(mname)
except Exception, e:
self.logger.warn('error reading line \'%s\'' %(l, str(e)))
continue
def load_addon_modules(self, modules_dir): def load_addon_modules(self, modules_dir):
""" load python modules from modules_dir """ load python modules from modules_dir