Unified Diff: sitescripts/extensions/bin/createNightlies.py
Issue 29349976:
Issue 4346 - Fix exception when creating Safari builds caused by buildtools changes (Closed)
Patch Set:
Created Aug. 19, 2016, 12:38 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« ensure_dependencies.py ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: sitescripts/extensions/bin/createNightlies.py |
| =================================================================== |
| --- a/sitescripts/extensions/bin/createNightlies.py |
| +++ b/sitescripts/extensions/bin/createNightlies.py |
| @@ -206,18 +206,19 @@ class NightlyBuild(object): |
| self.basename = metadata.get('general', 'basename') |
| self.compat = [] |
| if metadata.has_section('compat') and metadata.has_option('compat', 'chrome'): |
| self.compat.append({'id': 'chrome', 'minVersion': metadata.get('compat', 'chrome')}) |
| def readSafariMetadata(self): |
| import buildtools.packagerSafari as packager |
| + from buildtools import xarfile |
| metadata = packager.readMetadata(self.tempdir, self.config.type) |
| - certs = packager.get_certificates_and_key(self.config.keyFile)[0] |
| + certs = xarfile.read_certificates_and_key(self.config.keyFile)[0] |
| self.certificateID = packager.get_developer_identifier(certs) |
| self.version = packager.getBuildVersion(self.tempdir, metadata, False, |
| self.buildNum) |
| self.shortVersion = metadata.get('general', 'version') |
| self.basename = metadata.get('general', 'basename') |
| self.updatedFromGallery = False |
« no previous file with comments
|
« ensure_dependencies.py ('k')
|
no next file »
|
no next file with comments »
