Issue 2607 - Clear currentVersion on uninstallation

packagerGecko.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import sys
 import re
 import hashlib
@@ skipping 221 matching lines @@
     if name.startswith('lib/') and re.search(r'\bXMLHttpRequest\b', content):
       templateData['hasXMLHttpRequest'] = True
     if not '/' in name or name.startswith('lib/'):
       if re.search(r'(?:^|\s)onShutdown\.', content):
         templateData['hasShutdownHandlers'] = True
 
   for name, content in files.iteritems():
     if name == 'chrome.manifest':
       templateData['hasChrome'] = True
     elif name == 'defaults/prefs.json':
-      templateData['hasVersionPref'] = re.search(r'"currentVersion":', content) != None

[Wladimir Palant, 2015/05/29 18:40:52]

It's JSON data now, we can do better:

templateData['hasVersionPref'] = 'currentVersion' in
json.loads(content).get('defaults', {})

[Felix Dahlke, 2015/05/29 20:04:10]

Seemed a bit over the top to me considering that we also use regex to search xul
files. But it's nice and short here, done.

+      templateData['hasVersionPref'] = 'currentVersion' in json.loads(content).get('defaults', {})
     elif name.endswith('.js'):
       checkScript(name)
     elif name.endswith('.xul'):
       match = re.search(r'<(?:window|dialog)\s[^>]*\bwindowtype="([^">]+)"', content)
       if match:
         templateData['chromeWindows'].append(match.group(1))
 
   while True:
     missing = []
     for module in templateData['requires']:
@@ skipping 101 matching lines @@
   if metadata.has_section('preprocess'):
     files.preprocess([f for f, _ in metadata.items('preprocess')])
   if keyFile:
     signFiles(files, keyFile)
   files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x)
 
 def autoInstall(baseDir, type, host, port, multicompartment=False):
   fileBuffer = StringIO()
   createBuild(baseDir, type=type, outFile=fileBuffer, multicompartment=multicompartment)
   urllib.urlopen('http://%s:%s/' % (host, port), data=fileBuffer.getvalue())