[Pkg-mozext-commits] [adblock-plus] 173/464: Fixed: Wrong rewriting of resource entries in test environment

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit bf141a0a502bff5568b6f875bd713f716ec9eae5
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Nov 3 14:50:47 2011 +0100

    Fixed: Wrong rewriting of resource entries in test environment
---
 packager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager.py b/packager.py
index fca04f7..c260417 100644
--- a/packager.py
+++ b/packager.py
@@ -328,7 +328,7 @@ def setupTestEnvironment(baseDir, profileDirs):
       import urllib
       baseURL = 'file://' + urllib.quote(os.path.abspath(baseDir))
     files['chrome.manifest'] = re.sub(r'\bjar:chrome/\w+\.jar!', '%s/chrome' % baseURL, files['chrome.manifest'])
-    files['chrome.manifest'] = re.sub(r'\bresource\s+\S+\s+', r'\0%s/' % baseURL, files['chrome.manifest'])
+    files['chrome.manifest'] = re.sub(r'\b(resource\s+\S+\s+)', r'\1%s/' % baseURL, files['chrome.manifest'])
     files['chrome.manifest'] = re.sub(r'\b(content\s+\S+\s+)(\w+/)', r'\1%s/\2' % baseURL, files['chrome.manifest'])
     if os.path.exists(os.path.join(baseDir, 'mochitest')):
       files['chrome.manifest'] += 'content mochikit %s/mochitest/\n' % baseURL

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git