| Left: | ||
| Right: |
| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 """ | 126 """ |
| 127 Creates a property corresponding with a key in the nightly config file | 127 Creates a property corresponding with a key in the nightly config file |
| 128 """ | 128 """ |
| 129 return property(lambda self: self.nightlyConfig.get(self.repositoryName, key), | 129 return property(lambda self: self.nightlyConfig.get(self.repositoryName, key), |
| 130 lambda self, value: self.nightlyConfig.set(self.reposito ryName, key, value)) | 130 lambda self, value: self.nightlyConfig.set(self.reposito ryName, key, value)) |
| 131 | 131 |
| 132 config = None | 132 config = None |
| 133 nightlyConfig = None | 133 nightlyConfig = None |
| 134 repositoryName = None | 134 repositoryName = None |
| 135 repository = None | 135 repository = None |
| 136 revision = _defineProperty('revision', default='master') | |
| 137 | 136 |
| 138 spiderMonkeyBinary = _defineProperty('spiderMonkeyBinary', default='') | 137 spiderMonkeyBinary = _defineProperty('spiderMonkeyBinary', default='') |
| 139 nightliesDirectory = _defineProperty('nightliesDirectory') | 138 nightliesDirectory = _defineProperty('nightliesDirectory') |
| 140 nightliesURL = _defineProperty('nightliesURL') | 139 nightliesURL = _defineProperty('nightliesURL') |
| 141 downloadsRepo = _defineProperty('downloadsRepo') | 140 downloadsRepo = _defineProperty('downloadsRepo') |
| 142 downloadsURL = _defineProperty('downloadsURL') | 141 downloadsURL = _defineProperty('downloadsURL') |
| 143 docsDirectory = _defineProperty('docsDirectory') | 142 docsDirectory = _defineProperty('docsDirectory') |
| 144 signtool = _defineProperty('signtool') | 143 signtool = _defineProperty('signtool') |
| 145 certname = _defineProperty('signtool_certname') | 144 certname = _defineProperty('signtool_certname') |
| 145 revision = _defineProperty('revision', local=True, default='master') | |
|
Wladimir Palant
2016/11/07 13:33:25
Why did you put it in the middle of global propert
Jon Sonesen
2016/11/07 13:42:25
Acknowledged.
| |
| 146 dbdir = _defineProperty('signtool_dbdir') | 146 dbdir = _defineProperty('signtool_dbdir') |
| 147 dbpass = _defineProperty('signtool_dbpass') | 147 dbpass = _defineProperty('signtool_dbpass') |
| 148 | 148 |
| 149 keyFile = _defineProperty('key', local=True, default='') | 149 keyFile = _defineProperty('key', local=True, default='') |
| 150 name = _defineProperty('name', local=True) | 150 name = _defineProperty('name', local=True) |
| 151 galleryID = _defineProperty('galleryID', local=True, default='') | 151 galleryID = _defineProperty('galleryID', local=True, default='') |
| 152 devbuildGalleryID = _defineProperty('devbuildGalleryID', local=True, default ='') | 152 devbuildGalleryID = _defineProperty('devbuildGalleryID', local=True, default ='') |
| 153 downloadPage = _defineProperty('downloadPage', local=True, default='') | 153 downloadPage = _defineProperty('downloadPage', local=True, default='') |
| 154 clientID = _defineProperty('clientID', local=True, default='') | 154 clientID = _defineProperty('clientID', local=True, default='') |
| 155 clientSecret = _defineProperty('clientSecret', local=True, default='') | 155 clientSecret = _defineProperty('clientSecret', local=True, default='') |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 375 if not extensions: | 375 if not extensions: |
| 376 return | 376 return |
| 377 | 377 |
| 378 updates = {} | 378 updates = {} |
| 379 for extension in extensions: | 379 for extension in extensions: |
| 380 updates[extension['basename']] = { | 380 updates[extension['basename']] = { |
| 381 'url': extension['updateURL'], | 381 'url': extension['updateURL'], |
| 382 'version': extension['version'] | 382 'version': extension['version'] |
| 383 } | 383 } |
| 384 writeLibabpUpdateManifest(path, updates) | 384 writeLibabpUpdateManifest(path, updates) |
| OLD | NEW |