Issue 6523 - Update softlink for downloaded builds

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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
@@ skipping 533 matching lines @@
 
         request = self.generate_jwt_request(iss, secret, url, 'GET')
         response = json.load(urllib2.urlopen(request))
 
         necessary = ['passed_review', 'reviewed', 'processed', 'valid']
         if all(response[x] for x in necessary):
             download_url = response['files'][0]['download_url']
             checksum = response['files'][0]['hash']
 
             filename = '{}-{}.xpi'.format(self.basename, version)
-            file_path = os.path.join(
+            self.path = os.path.join(
                 config.get('extensions', 'nightliesDirectory'),
                 self.basename,
                 filename
             )
 
             request = self.generate_jwt_request(iss, secret, download_url,
                                                 'GET')
             try:
                 response = urllib2.urlopen(request)
             except urllib2.HTTPError as e:
                 logging.error(e.read())
 
             # Verify the extension's integrity
             file_content = response.read()
             sha256 = hashlib.sha256(file_content)
             returned_checksum = '{}:{}'.format(sha256.name, sha256.hexdigest())
 
             if returned_checksum != checksum:
                 logging.error('Checksum could not be verified: {} vs {}'
                               ''.format(checksum, returned_checksum))
 
-            with open(file_path, 'w') as fp:
+            with open(self.path, 'w') as fp:
                 fp.write(file_content)
 
             self.update_link = os.path.join(
                 config.get('extensions', 'nightliesURL'),
                 self.basename,
                 filename
             )
 
             self.remove_from_downloads_lockfile(self.config.type,
                                                 'version',
@@ skipping 252 matching lines @@
                     # write out changelog
                     self.writeChangelog(self.getChanges())
 
                     # write update manifest
                     self.writeUpdateManifest()
 
                     # retire old builds
                     versions = self.retireBuilds()
                     # update index page
                     self.updateIndex(versions)
+
+                    # Update soft link to latest build
+                    baseDir = os.path.join(
+                        self.config.nightliesDirectory, self.basename
+                    )
+                    linkPath = os.path.join(
+                        baseDir, '00latest' + self.config.packageSuffix
+                    )
+
+                    self.symlink_or_copy(self.path, linkPath)

[Vasily Kuznetsov, 2018/03/26 19:12:11]

What if we don't have `self.path` because in `download_from_mozilla_addons` we
followed the `else` branch of the `if` statement at line 549?

+
             finally:
                 # clean up
                 if self.tempdir:
                     shutil.rmtree(self.tempdir, ignore_errors=True)
 
 
 def main(download=False):
     """
       main function for createNightlies.py
     """
@@ skipping 20 matching lines @@
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--download', action='store_true', default=False)
     args = parser.parse_args()
     main(args.download)