Issue 2796 - Moved logic to extract Safari Developer ID to buildtools

sitescripts/extensions/bin/updateUpdateManifests.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Generate update manifests
 =========================
 
   This script generates update manifests for all extensions and apps
 """
 
 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
 
 def readMetadata(repo, version):
   """
   reads extension ID and compatibility information from metadata file in the
   extension's repository
   """
   if repo.type == 'android':
     command = ['hg', '-R', repo.repository, 'id', '-r', version, '-n']
     result = subprocess.check_output(command)
     revision = re.sub(r'\D', '', result)
 
     return {
       'revision': revision,
       'version': version,
       'minSdkVersion': get_min_sdk_version(repo, version),
       'basename': os.path.basename(repo.repository)
     }
   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'),
     }
   elif repo.type == 'gecko':
     metadata = repo.readMetadata(version)
     result = {
       'extensionID': metadata.get('general', 'id'),
       'version': version,
       'compat': []
@@ skipping 48 matching lines @@
   """
   updates all update manifests with the current versions
   """
 
   parser = SafeConfigParser()
   getDownloadLinks(parser)
   writeUpdateManifest(parser)
 
 if __name__ == "__main__":
   updateUpdateManifests()