Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: sitescripts/extensions/bin/updateUpdateManifests.py

Issue 29322523: Issue 2796 - Moved logic to extract Safari Developer ID to buildtools (Closed)
Patch Set: Updated dependency Created July 17, 2015, 11:55 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sitescripts/extensions/bin/createNightlies.py ('k') | sitescripts/extensions/utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sitescripts/extensions/bin/updateUpdateManifests.py
===================================================================
--- a/sitescripts/extensions/bin/updateUpdateManifests.py
+++ b/sitescripts/extensions/bin/updateUpdateManifests.py
@@ -25,11 +25,15 @@
import os
import re
import subprocess
+from ConfigParser import SafeConfigParser
+
from buildtools.packagerGecko import KNOWN_APPS
-from ConfigParser import SafeConfigParser
+from buildtools.packagerSafari import (get_developer_identifier,
+ get_certificates_and_key)
+
from sitescripts.utils import get_config, get_template
from sitescripts.extensions.utils import (
- Configuration, getDownloadLinks, getSafariCertificateID,
+ Configuration, getDownloadLinks,
writeIEUpdateManifest, writeAndroidUpdateManifest)
from sitescripts.extensions.android import get_min_sdk_version
@@ -51,8 +55,10 @@
}
elif repo.type == 'safari':
metadata = repo.readMetadata(version)
+ certs = get_certificates_and_key(repo.keyFile)[0]
+
return {
- 'certificateID': getSafariCertificateID(repo.keyFile),
+ 'certificateID': get_developer_identifier(certs),
'version': version,
'shortVersion': version,
'basename': metadata.get('general', 'basename'),
« no previous file with comments | « sitescripts/extensions/bin/createNightlies.py ('k') | sitescripts/extensions/utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld