MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/import_layer: fix errors in maintainer scraping code

Browse Source 
* Fix "sre_constants.error: nothing to repeat" error due to .* inside
  group made optional with ? in regex
* Avoid error if maintainer responsibility is not specified

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2014-06-12 11:21:40 +01:00
parent 0ec1909051
commit 7a432108c0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layerindex/tools/import_layer.py
View File

@ -383,7 +383,7 @@ def main():
layer.layer_type = 'A' layer.layer_type = 'A'
if maintainers: if maintainers:
maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.*)?$') maint_re = re.compile(r'^"?([^"@$<>]+)"? *<([^<> ]+)>[ -]*(.+)?$')
for maintentry in maintainers: for maintentry in maintainers:
res = maint_re.match(maintentry) res = maint_re.match(maintentry)
if res: if res:
@ -391,6 +391,7 @@ def main():
maintainer.layerbranch = layerbranch maintainer.layerbranch = layerbranch
maintainer.name = res.group(1).strip() maintainer.name = res.group(1).strip()
maintainer.email = res.group(2) maintainer.email = res.group(2)
if res.group(3):
maintainer.responsibility = res.group(3).strip() maintainer.responsibility = res.group(3).strip()
maintainer.save() maintainer.save()