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

sitescripts/extensions/bin/createNightlies.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,
@@ skipping 13 matching lines @@
   with changelogs and documentation.
 
 """
 
 import sys, os, os.path, subprocess, ConfigParser, traceback, json, hashlib
 import tempfile, shutil, urlparse, pipes, time, urllib2, struct
 from datetime import datetime
 from urllib import urlencode
 from xml.dom.minidom import parse as parseXml
 from sitescripts.utils import get_config, setupStderr, get_template
-from sitescripts.extensions.utils import (
-  compareVersions, Configuration, getSafariCertificateID,
-  writeAndroidUpdateManifest)
+from sitescripts.extensions.utils import compareVersions, Configuration, writeAndroidUpdateManifest
 
 MAX_BUILDS = 50
 
 
 class NightlyBuild(object):
   """
     Performs the build process for an extension,
     generating changelogs and documentation.
   """
 
@@ skipping 139 matching lines @@
     if self.config.experimental:
       self.basename += '-experimental'
 
     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
     metadata = packager.readMetadata(self.tempdir, self.config.type)
+    certs = packager.get_certificates_and_key(self.config.keyFile)[0]
 
-    self.certificateID = getSafariCertificateID(self.config.keyFile)
+    self.certificateID = packager.get_developer_identifier(certs)
     self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
     self.shortVersion = metadata.get("general", "version")
     self.basename = metadata.get("general", "basename")
 
   def writeUpdateManifest(self):
     """
       Writes update.rdf file for the current build
     """
     baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
     if not os.path.exists(baseDir):
@@ skipping 302 matching lines @@
     except Exception, ex:
       print >>sys.stderr, "The build for %s failed:" % repo
       traceback.print_exc()
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()