From ec053df94bca3c306ba125aa9fb2252d9e7a4d6b Mon Sep 17 00:00:00 2001
From: Rolf Bork <rbork@caltech.edu>
Date: Wed, 7 Aug 2019 11:27:11 -0500
Subject: [PATCH] Bug fix: Had some tabs instead of spaces which would result
in inconsistent tab/space indentation errors when run.
---
src/epics/util/post_build_script.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/epics/util/post_build_script.py b/src/epics/util/post_build_script.py
index aefb513d7..498c89f3d 100755
--- a/src/epics/util/post_build_script.py
+++ b/src/epics/util/post_build_script.py
@@ -184,7 +184,7 @@ def parse_block(data_lines,line_number,reference_name):
#Search the file (i.e. data_lines) for the names in order
for name in reference_name_tree:
for current_line_count in range(line_number,len(data_lines)):
- current_line = data_lines[current_line_count]
+ current_line = data_lines[current_line_count]
if (current_line.split()[0] == 'Name'):
if (current_line.split('"')[1] == name):
break
@@ -208,12 +208,12 @@ def parse_block(data_lines,line_number,reference_name):
while data_lines[current_line_count].split()[-1] != '{':
current_line_count += 1
if current_line_count == len(data_lines):
- sys.stderr.write("ERROR: For part: " + reference_name + "\n")
- sys.stderr.write("Could not find the proper library reference.\n")
- sys.stderr.write("Your model may be referencing a different source model than what is in the current library path.\n\n")
- sys.stderr.write("Current path is: " + rcg_lib_path + "\n\n")
- sys.stderr.write("Exiting\n")
- sys.exit(1)
+ sys.stderr.write("ERROR: For part: " + reference_name + "\n")
+ sys.stderr.write("Could not find the proper library reference.\n")
+ sys.stderr.write("Your model may be referencing a different source model than what is in the current library path.\n\n")
+ sys.stderr.write("Current path is: " + rcg_lib_path + "\n\n")
+ sys.stderr.write("Exiting\n")
+ sys.exit(1)
new_block,scratch = parse_block(data_lines,current_line_count,None)
if description_present:
@@ -406,9 +406,9 @@ def read_tree(node,name_so_far):
for before, after in custom_subs:
if not '--name' in before:
temp_lines[k] = string.replace(temp_lines[k],before,after)
- if quiet_mode == False:
- print(adl_target_name)
- output_medm_file = open(adl_target_name,'w')
+ if quiet_mode == False:
+ print(adl_target_name)
+ output_medm_file = open(adl_target_name,'w')
for k in range(len(temp_lines)):
output_medm_file.write(temp_lines[k])
break
--
GitLab