Skip to content

Commit 629802f

Browse files
committed
fix git status check
1 parent 25d0d6d commit 629802f

File tree

1 file changed

+3
-11
lines changed
  • installation_and_upgrade/ibex_install_utils/tasks

1 file changed

+3
-11
lines changed

installation_and_upgrade/ibex_install_utils/tasks/git_tasks.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
class GitTasks(BaseTasks):
1010
@task(f"Show Git status in {EPICS_PATH}")
11-
def show_git_status(self):
12-
subprocess.call(f"cd {EPICS_PATH} && git status", shell=True)
11+
def show_git_status(self) -> None:
12+
subprocess.call(f"cd /d {EPICS_PATH} && git status", shell=True)
1313

1414
@task("Swap instrument git branch to release on CONTROL-SVCS")
15-
def checkout_to_release_branch(self):
15+
def checkout_to_release_branch(self) -> None:
1616
version_pattern = r"^\d+\.\d+\.\d+$"
1717
if self._server_source_dir.endswith("32"):
1818
remote_repo = "EPICS32.git"
@@ -61,11 +61,3 @@ def checkout_to_release_branch(self):
6161
except subprocess.CalledProcessError as e:
6262
print(f"Error checking out to new release branch and push: {e}")
6363
print("Branch may previously exist either locally or remotely - intervention required")
64-
65-
66-
# something for the future in case creting new beranch fails - maybe one exists we want to use?
67-
# try:
68-
# subprocess.check_call(f"cd {EPICS_PATH} && git checkout %COMPUTERNAME%", shell=True)
69-
# print("Switched to existing release branch")
70-
# except subprocess.CalledProcessError as e:
71-
# print(f"Error switching to existing release branch and push: {e}")

0 commit comments

Comments
 (0)