From 6b839731244584e8c0ac1a504648eeac7724f292 Mon Sep 17 00:00:00 2001 From: Connor Bray Date: Mon, 21 May 2018 10:15:59 +0100 Subject: [PATCH] Updated order of reverting --- aws_conduit/helper.py | 6 +++--- setup.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws_conduit/helper.py b/aws_conduit/helper.py index f1bd255..6c6ccdc 100644 --- a/aws_conduit/helper.py +++ b/aws_conduit/helper.py @@ -221,12 +221,12 @@ def replace_resources(directory, bucket, prefix, path=None, file_data=None): def revert_resources(directory, bucket, prefix, path=None, file_data=None): if file_data is not None: print("Replacing in {}".format(path)) + data = data.replace(BUCKET_KEY, BUCKET_KEY_OTHER) + data = data.replace(PREFIX_KEY, PREFIX_KEY_OTHER) + data = data.replace(RESOURCES_KEY, RESOURCES_KEY_OTHER) data = file_data.replace(directory, RESOURCES_KEY) data = data.replace(bucket.name,BUCKET_KEY) data = data.replace(prefix, PREFIX_KEY) - data = data.replace(RESOURCES_KEY, RESOURCES_KEY_OTHER) - data = data.replace(BUCKET_KEY, BUCKET_KEY_OTHER) - data = data.replace(PREFIX_KEY, PREFIX_KEY_OTHER) return data diff --git a/setup.py b/setup.py index 16a22b5..2a52427 100644 --- a/setup.py +++ b/setup.py @@ -7,12 +7,12 @@ include_package_data=True, name='aws_conduit', packages=['aws_conduit', 'aws_conduit.aws'], - version='0.0.32', + version='0.0.33', description='Product management for AWS Service Catalog.', author='Connor Bray', author_email='connor.bray@icloud.com', url="https://github.com/concon121/aws-conduit", - download_url="https://github.com/concon121/aws-conduit/archive/0.0.32.tar.gz", + download_url="https://github.com/concon121/aws-conduit/archive/0.0.33.tar.gz", install_requires=required, keywords=['aws', 'servicecatalog'], entry_points={