From 4ff9131e6131f24c8e8479e386d2638754d88b42 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Sep 2017 13:54:51 +0100 Subject: [PATCH] Redeploy script: don't bail if bundle exists (#4977) Just don't bother replacing that bundle. Continue redeploying the rest as other assets (eg translation files) may have changed. --- scripts/deploy.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/deploy.py b/scripts/deploy.py index cc350e4c9..e7ad3f78a 100755 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -13,6 +13,7 @@ import os.path import subprocess import sys import tarfile +import shutil try: # python3 @@ -48,11 +49,12 @@ def move_bundles(source, dest): for f in os.listdir(source): dst = os.path.join(dest, f) if os.path.exists(dst): - raise DeployException( - "Not deploying. The bundle includes '%s' which we have previously deployed." + print ( + "Skipping bundle. The bundle includes '%s' which we have previously deployed." % f ) - renames[os.path.join(source, f)] = dst + else: + renames[os.path.join(source, f)] = dst for (src, dst) in renames.iteritems(): print ("Move %s -> %s" % (src, dst)) @@ -107,9 +109,9 @@ class Deployer: extracted_bundles = os.path.join(extracted_dir, 'bundles') move_bundles(source=extracted_bundles, dest=self.bundles_path) - # replace the (hopefully now empty) extracted_bundles dir with a - # symlink to the common dir. - os.rmdir(extracted_bundles) + # replace the extracted_bundles dir (which may not be empty if some + # bundles were skipped) with a symlink to the common dir. + shutil.rmtree(extracted_bundles) create_relative_symlink( target=self.bundles_path, linkname=extracted_bundles,