[Pkg-mozext-commits] [adblock-plus] 12/17: Issue 2607 - Clear currentVersion on uninstallation

[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 f469dec8bb8059104be0c5f5521c2a72deed53aa
Author: Felix Dahlke <felix at adblockplus.org>
Date:   Fri May 29 18:26:32 2015 +0200

    Issue 2607 - Clear currentVersion on uninstallation
---
 packagerGecko.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packagerGecko.py b/packagerGecko.py
index 5a37ca5..748bf28 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -231,9 +231,6 @@ def addMissingFiles(params, files):
         templateData['hasChromeRequires'] = True
     if name.startswith('lib/') and re.search(r'\bXMLHttpRequest\b', content):
       templateData['hasXMLHttpRequest'] = True
-    if name == 'defaults/prefs.js':
-      if re.search(r'\.currentVersion"', content):
-        templateData['hasVersionPref'] = True
     if not '/' in name or name.startswith('lib/'):
       if re.search(r'(?:^|\s)onShutdown\.', content):
         templateData['hasShutdownHandlers'] = True
@@ -241,6 +238,8 @@ def addMissingFiles(params, files):
   for name, content in files.iteritems():
     if name == 'chrome.manifest':
       templateData['hasChrome'] = True
+    elif name == 'defaults/prefs.json':
+      templateData['hasVersionPref'] = 'currentVersion' in json.loads(content).get('defaults', {})
     elif name.endswith('.js'):
       checkScript(name)
     elif name.endswith('.xul'):

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