Issue 1362 - createNightlies script should call ensure_dependencies

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 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 74 matching lines @@
   def copyRepository(self):
     '''
       Create a repository copy in a temporary directory
     '''
     # We cannot use hg archive here due to
     # http://bz.selenic.com/show_bug.cgi?id=3747, have to clone properly :-(
     self.tempdir = tempfile.mkdtemp(prefix=self.config.repositoryName)
     command = ['hg', 'clone', '-q', self.config.repository, '-u', 'default', self.tempdir]
     subprocess.check_call(command)
 
+    # Make sure to process the dependencies file if it is present
+    import logging
+    logging.disable(logging.WARNING)
+    try:
+      from buildtools.ensure_dependencies import resolve_deps
+      resolve_deps(self.tempdir, self_update=False,
+          overrideroots={"hg": os.path.dirname(self.config.repository)},
+          skipdependencies=set(["buildtools"]))

[Sebastian Noack, 2014/09/18 16:27:46]

We don't support Python 2.6 anymore, right? Then you can use set literals:

set(["buildtools"]) -> {"buildtools"}

[Wladimir Palant, 2014/09/18 18:18:18]

Done.

+    finally:
+      logging.disable(logging.NOTSET)
+
   def writeChangelog(self, changes):
     """
       write the changelog file into the cloned repository
     """
     baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
     if not os.path.exists(baseDir):
       os.makedirs(baseDir)
     changelogFile = "%s-%s.changelog.xhtml" % (self.basename, self.version)
     changelogPath = os.path.join(baseDir, changelogFile)
     self.changelogURL = urlparse.urljoin(self.config.nightliesURL, self.basename + '/' + changelogFile)
@@ skipping 387 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()