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.pull/4986/head
parent
a94710a9a5
commit
4ff9131e61
|
@ -13,6 +13,7 @@ import os.path
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tarfile
|
import tarfile
|
||||||
|
import shutil
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# python3
|
# python3
|
||||||
|
@ -48,11 +49,12 @@ def move_bundles(source, dest):
|
||||||
for f in os.listdir(source):
|
for f in os.listdir(source):
|
||||||
dst = os.path.join(dest, f)
|
dst = os.path.join(dest, f)
|
||||||
if os.path.exists(dst):
|
if os.path.exists(dst):
|
||||||
raise DeployException(
|
print (
|
||||||
"Not deploying. The bundle includes '%s' which we have previously deployed."
|
"Skipping bundle. The bundle includes '%s' which we have previously deployed."
|
||||||
% f
|
% f
|
||||||
)
|
)
|
||||||
renames[os.path.join(source, f)] = dst
|
else:
|
||||||
|
renames[os.path.join(source, f)] = dst
|
||||||
|
|
||||||
for (src, dst) in renames.iteritems():
|
for (src, dst) in renames.iteritems():
|
||||||
print ("Move %s -> %s" % (src, dst))
|
print ("Move %s -> %s" % (src, dst))
|
||||||
|
@ -107,9 +109,9 @@ class Deployer:
|
||||||
extracted_bundles = os.path.join(extracted_dir, 'bundles')
|
extracted_bundles = os.path.join(extracted_dir, 'bundles')
|
||||||
move_bundles(source=extracted_bundles, dest=self.bundles_path)
|
move_bundles(source=extracted_bundles, dest=self.bundles_path)
|
||||||
|
|
||||||
# replace the (hopefully now empty) extracted_bundles dir with a
|
# replace the extracted_bundles dir (which may not be empty if some
|
||||||
# symlink to the common dir.
|
# bundles were skipped) with a symlink to the common dir.
|
||||||
os.rmdir(extracted_bundles)
|
shutil.rmtree(extracted_bundles)
|
||||||
create_relative_symlink(
|
create_relative_symlink(
|
||||||
target=self.bundles_path,
|
target=self.bundles_path,
|
||||||
linkname=extracted_bundles,
|
linkname=extracted_bundles,
|
||||||
|
|
Loading…
Reference in New Issue