Bug 782324 - Add support in JarMaker for file names that contain '@'.…

… r=khuey
mozilla-services · Aug 31, 2012 · 0889c95 · 0889c95
1 parent 45cf176
commit 0889c95
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/config/JarMaker.py b/config/JarMaker.py
@@ -66,7 +66,7 @@ class JarMaker(object):
   jarline = re.compile('(?:(?P<jarfile>[\w\d.\-\_\\\/]+).jar\:)|(?:\s*(\#.*)?)\s*$')
   regline = re.compile('\%\s+(.*)$')
   entryre = '(?P<optPreprocess>\*)?(?P<optOverwrite>\+?)\s+'
-  entryline = re.compile(entryre + '(?P<output>[\w\d.\-\_\\\/\+]+)\s*(\((?P<locale>\%?)(?P<source>[\w\d.\-\_\\\/]+)\))?\s*$')
+  entryline = re.compile(entryre + '(?P<output>[\w\d.\-\_\\\/\+\@]+)\s*(\((?P<locale>\%?)(?P<source>[\w\d.\-\_\\\/\@]+)\))?\s*$')
 
   def __init__(self, outputFormat = 'flat', useJarfileManifest = True,
                useChromeManifest = False):