wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bustage fix for bug 1210687 on a CLOSED TREE. r=me

Browse Source 
Looks like I went too fancy removing a part of the jarline regexp before landing.
This commit is contained in:
Mike Hommey 2015-10-08 17:28:12 +09:00
parent 3e0d0114d8
commit 297db4e708
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/mozbuild/mozbuild/jar.py
View File

@ -89,7 +89,7 @@ class JarInfo(object):
class JarManifestParser(object):
ignore = re.compile('\s*(\#.*)?$')
jarline = re.compile('(?P<jarfile>[\w\d.\-\_\\\/{}]+).jar\:$')
jarline = re.compile('(?:(?P<jarfile>[\w\d.\-\_\\\/{}]+).jar\:)|(?:\s*(\#.*)?)\s*$')
relsrcline = re.compile('relativesrcdir\s+(?P<relativesrcdir>.+?):')
regline = re.compile('\%\s+(.*)$')
entryre = '(?P<optPreprocess>\*)?(?P<optOverwrite>\+?)\s+'
@ -115,8 +115,9 @@ class JarManifestParser(object):
m = self.jarline.match(line)
if not m:
raise RuntimeError(line)
self._current_jar = JarInfo(m.group('jarfile'))
self._jars.append(self._current_jar)
if m.group('jarfile'):
self._current_jar = JarInfo(m.group('jarfile'))
self._jars.append(self._current_jar)
return
# Within each section, there can be three different types of entries: