| OLD | NEW | 
|---|
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, | 
| 2 # Copyright (C) 2006-2016 Eyeo GmbH | 2 # Copyright (C) 2006-2016 Eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 26 from ConfigParser import SafeConfigParser, NoOptionError | 26 from ConfigParser import SafeConfigParser, NoOptionError | 
| 27 from StringIO import StringIO | 27 from StringIO import StringIO | 
| 28 from sitescripts.utils import get_config | 28 from sitescripts.utils import get_config | 
| 29 | 29 | 
| 30 PACKAGE_SUFFIXES = { | 30 PACKAGE_SUFFIXES = { | 
| 31     'gecko': '.xpi', | 31     'gecko': '.xpi', | 
| 32     'gecko-webext': '.xpi', | 32     'gecko-webext': '.xpi', | 
| 33     'chrome': '.crx', | 33     'chrome': '.crx', | 
| 34     'safari': '.safariextz', | 34     'safari': '.safariextz', | 
| 35     'ie': '.exe', | 35     'ie': '.exe', | 
| 36     'android': '.apk' | 36     'android': '.apk', | 
|  | 37     'edge': '.appx' | 
| 37 } | 38 } | 
| 38 | 39 | 
| 39 | 40 | 
| 40 def compareVersionParts(part1, part2): | 41 def compareVersionParts(part1, part2): | 
| 41     def convertInt(value, default): | 42     def convertInt(value, default): | 
| 42         try: | 43         try: | 
| 43             return int(value) | 44             return int(value) | 
| 44         except ValueError: | 45         except ValueError: | 
| 45             return default | 46             return default | 
| 46 | 47 | 
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 147     dbpass = _defineProperty('signtool_dbpass') | 148     dbpass = _defineProperty('signtool_dbpass') | 
| 148 | 149 | 
| 149     keyFile = _defineProperty('key', local=True, default='') | 150     keyFile = _defineProperty('key', local=True, default='') | 
| 150     name = _defineProperty('name', local=True) | 151     name = _defineProperty('name', local=True) | 
| 151     galleryID = _defineProperty('galleryID', local=True, default='') | 152     galleryID = _defineProperty('galleryID', local=True, default='') | 
| 152     devbuildGalleryID = _defineProperty('devbuildGalleryID', local=True, default
     ='') | 153     devbuildGalleryID = _defineProperty('devbuildGalleryID', local=True, default
     ='') | 
| 153     downloadPage = _defineProperty('downloadPage', local=True, default='') | 154     downloadPage = _defineProperty('downloadPage', local=True, default='') | 
| 154     clientID = _defineProperty('clientID', local=True, default='') | 155     clientID = _defineProperty('clientID', local=True, default='') | 
| 155     clientSecret = _defineProperty('clientSecret', local=True, default='') | 156     clientSecret = _defineProperty('clientSecret', local=True, default='') | 
| 156     refreshToken = _defineProperty('refreshToken', local=True, default='') | 157     refreshToken = _defineProperty('refreshToken', local=True, default='') | 
|  | 158     tenantID = _defineProperty('tenantID', local=True, default='') | 
| 157     revision = _defineProperty('revision', local=True, default='master') | 159     revision = _defineProperty('revision', local=True, default='master') | 
| 158 | 160 | 
| 159     latestRevision = _defineNightlyProperty('latestRevision') | 161     latestRevision = _defineNightlyProperty('latestRevision') | 
| 160 | 162 | 
| 161     def __init__(self, config, nightlyConfig, repositoryName, repository): | 163     def __init__(self, config, nightlyConfig, repositoryName, repository): | 
| 162         """ | 164         """ | 
| 163           Creates a new Configuration instance that is bound to a particular | 165           Creates a new Configuration instance that is bound to a particular | 
| 164           repository. | 166           repository. | 
| 165         """ | 167         """ | 
| 166 | 168 | 
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 379     if not extensions: | 381     if not extensions: | 
| 380         return | 382         return | 
| 381 | 383 | 
| 382     updates = {} | 384     updates = {} | 
| 383     for extension in extensions: | 385     for extension in extensions: | 
| 384         updates[extension['basename']] = { | 386         updates[extension['basename']] = { | 
| 385             'url': extension['updateURL'], | 387             'url': extension['updateURL'], | 
| 386             'version': extension['version'] | 388             'version': extension['version'] | 
| 387         } | 389         } | 
| 388     writeLibabpUpdateManifest(path, updates) | 390     writeLibabpUpdateManifest(path, updates) | 
| OLD | NEW | 
|---|