add check for merging

Author: awsandy

aws2tf.py

@@ -332,12 +332,22 @@ def main():
         else: common.empty_and_delete_bucket()
 
 
+        # does a terraform.tfstate file exist in globals.path1 directory ?
+    if not os.path.isfile(globals.path1+"/terraform.tfstate") and globals.merge:
+            print("No terraform.tfstate file found in "+globals.path1+" - cannot merge")
+            globals.merge=False
+            com = "rm -rf "+globals.path1
+            rout = common.rc(com)
+            if globals.serverless: common.empty_and_delete_bucket()
+
+
     if globals.merge is False:
         com = "rm -rf "+globals.path1
         rout = common.rc(com)
         if globals.serverless: common.empty_and_delete_bucket()
 
 
+
     com = "mkdir -p "+globals.path2
     rout = common.rc(com)