mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bustage fix for bug 1210687 on a CLOSED TREE. r=me
Looks like I went too fancy removing a part of the jarline regexp before landing.
This commit is contained in:
parent
d06c33891f
commit
68aeaf30b5
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user