Issue 3758 - Fixed Safari/Android builds, broken by changeset 7e1d26dc0bcf

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 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 203 matching lines @@
     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")
     self.updatedFromGallery = False
 
   def writeUpdateManifest(self):
     """
       Writes update.rdf file for the current build
     """
+    baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
     if self.config.type == 'safari':
       manifestPath = os.path.join(baseDir, "updates.plist")
       templateName = 'safariUpdateManifest'
     elif self.config.type == 'android':
       manifestPath = os.path.join(baseDir, "updates.xml")
       templateName = 'androidUpdateManifest'
     else:
       return
 
-    baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
     if not os.path.exists(baseDir):
       os.makedirs(baseDir)
 
     # ABP for Android used to have its own update manifest format. We need to
     # generate both that and the new one in the libadblockplus format as long
     # as a significant amount of users is on an old version.
     if self.config.type == 'android':
       newManifestPath = os.path.join(baseDir, "update.json")
       writeAndroidUpdateManifest(newManifestPath, [{
         'basename': self.basename,
@@ skipping 375 matching lines @@
     except Exception, ex:
       logging.error("The build for %s failed:", repo)
       logging.exception(ex)
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()