Merge pull request #2933 from UAVenture/ignore_conflict_files

Check supported extensions for rc.autostart generation
This commit is contained in:
Lorenz Meier
2015-10-06 17:27:01 +02:00
2 changed files with 6 additions and 4 deletions

View File

@@ -151,7 +151,7 @@ class SourceParser(object):
Returns list of supported file extensions that can be parsed by this
parser. The parser uses any extension.
"""
return [""]
return ["", ".hil"]
def Parse(self, path, contents):
"""

View File

@@ -16,9 +16,11 @@ class SourceScanner(object):
extensions = tuple(parser.GetSupportedExtensions())
for dirname, dirnames, filenames in os.walk(srcdir):
for filename in filenames:
path = os.path.join(dirname, filename)
if not self.ScanFile(path, parser):
return False
extension = os.path.splitext(filename)[1]
if extension in extensions:
path = os.path.join(dirname, filename)
if not self.ScanFile(path, parser):
return False
return True
def ScanFile(self, path, parser):