Put manual prompt into right spot

esmith1729 · danielmaclaren · zsoltkebel · esmith1729 · commit e9af8263a457 · 2024-03-01T14:40:34.000Z
Co-authored-by: dtmaclaren &lt;danielmaclaren@users.noreply.github.com&gt;
Co-authored-by:  zsoltkebel &lt;zsoltkebel@users.noreply.github.com&gt;
diff --git a/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py
@@ -115,7 +115,7 @@ def automatic_merge_of_git_remote(self, branch_to_merge_from, branch_to_merge_to
                 print(
                     f"Error doing automatic merge, please perform the merge manually: {e}"
                 )
-            self.prompt.prompt_and_raise_if_not_yes(manual_prompt)
+                self.prompt.prompt_and_raise_if_not_yes(manual_prompt)
         else:
             self.prompt.prompt_and_raise_if_not_yes(manual_prompt)
 
diff --git a/installation_and_upgrade/ibex_install_utils/tasks/update_scripts.py b/installation_and_upgrade/ibex_install_utils/tasks/update_scripts.py
@@ -21,7 +21,7 @@ def update_scripts(self):
 
 if __name__ == "__main__":
     prompt = UserPrompt(True,False)
-    print(f"%COMPUTERNAME%")
+    print(COMPUTERNAME)
     UpdateScripts(prompt, "", "", "", "", "").update_scripts()
 
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ def automatic_merge_of_git_remote(self, branch_to_merge_from, branch_to_merge_to`
`115`	`115`	`print(`
`116`	`116`	`f"Error doing automatic merge, please perform the merge manually: {e}"`
`117`	`117`	`)`
`118`		`- self.prompt.prompt_and_raise_if_not_yes(manual_prompt)`
	`118`	`+ self.prompt.prompt_and_raise_if_not_yes(manual_prompt)`
`119`	`119`	`else:`
`120`	`120`	`self.prompt.prompt_and_raise_if_not_yes(manual_prompt)`
`121`	`121`