Reduce mkconcore changes to only docker build-dir normalization

Author: Titas-Ghosh

mkconcore.py

@@ -284,7 +284,7 @@ def cleanup_script_files():
 nodes_dict = dict()
 node_id_to_label_map = dict() # Helper to get clean node labels from GraphML ID
 
-for node in nodes_text:
+for node in nodes_text:
     try:
         data = node.find('data', recursive=False)
         if data:
@@ -306,16 +306,16 @@ def cleanup_script_files():
 
                 nodes_dict[node['id']] = node_label
                 node_id_to_label_map[node['id']] = node_label.split(':')[0]
-    except (IndexError, AttributeError):
-        logging.debug('A node with no valid properties encountered and ignored')
-
-label_values = list(nodes_dict.values())
-duplicates = {label for label in label_values if label_values.count(label) > 1}
-if duplicates:
-    logging.error(f"Duplicate node labels found: {sorted(duplicates)}")
-    quit()
-
-for edge in edges_text:
+    except (IndexError, AttributeError):
+        logging.debug('A node with no valid properties encountered and ignored')
+
+label_values = list(nodes_dict.values())
+duplicates = {label for label in label_values if label_values.count(label) > 1}
+if duplicates:
+    logging.error(f"Duplicate node labels found: {sorted(duplicates)}")
+    quit()
+
+for edge in edges_text:
     try:
         data = edge.find('data', recursive=False)
         if data:
@@ -785,13 +785,13 @@ def cleanup_script_files():
                         fcopy.write('CMD ["./a.out"]\n')  # 7/02/21
 
     fbuild.write('#!/bin/bash' + "\n")
-    for node in nodes_dict:
-        containername,sourcecode = nodes_dict[node].split(':')
-        if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.rsplit(".", 1)
-            dockerbuilddir = "docker-"+dockername.replace("/", "__").replace("\\", "__")
-            fbuild.write("mkdir "+dockerbuilddir+"\n")
-            fbuild.write("cd "+dockerbuilddir+"\n")
+    for node in nodes_dict:
+        containername,sourcecode = nodes_dict[node].split(':')
+        if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
+            dockername,langext = sourcecode.rsplit(".", 1)
+            dockerbuilddir = "docker-"+dockername.replace("/", "__").replace("\\", "__")
+            fbuild.write("mkdir "+dockerbuilddir+"\n")
+            fbuild.write("cd "+dockerbuilddir+"\n")
             fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
             #copy sourcefiles from ./src into corresponding directories
             fbuild.write("cp ../src/"+sourcecode+" .\n")