Skip to content

Commit 957a83f

Browse files
author
Isaac Hill
committed
called ssh utils incorrectly
1 parent 13b435c commit 957a83f

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

hotfix_checker.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import sys
44
from util.channel_access import ChannelAccessUtils
5-
from util.ssh_access import runSSHCommand
5+
from util.ssh_access import SSHAccessUtils
66
import requests
77

88
EPICS_DIR = "C:\\Instrument\\Apps\\EPICS\\"
@@ -64,7 +64,8 @@ def check_for_uncommitted_changes(hostname):
6464
CHECK: The result of the check.
6565
"""
6666
command = f"cd {EPICS_DIR} && git status --porcelain"
67-
ssh_process = runSSHCommand(hostname, SSH_USERNAME, SSH_PASSWORD, command)
67+
ssh_process = SSHAccessUtils.runSSHCommand(
68+
hostname, SSH_USERNAME, SSH_PASSWORD, command)
6869

6970
if ssh_process['success']:
7071
if ssh_process['output'].strip() != "":
@@ -86,7 +87,8 @@ def get_parent_branch(hostname):
8687
str: The name of the parent branch.
8788
"""
8889
command = f"cd {EPICS_DIR} && git log"
89-
ssh_process = runSSHCommand(hostname, SSH_USERNAME, SSH_PASSWORD, command)
90+
ssh_process = SSHAccessUtils.runSSHCommand(
91+
hostname, SSH_USERNAME, SSH_PASSWORD, command)
9092
if ssh_process['success']:
9193
if "galil-old" in ssh_process['output']:
9294
return "origin/galil-old"
@@ -117,14 +119,15 @@ def git_log_analyszer(hostname, changes_on=None, subtracted_against=None, prefix
117119

118120
# fetch latest changes from the remote
119121
fetch_command = f"cd {EPICS_DIR} && git fetch origin"
120-
ssh_process_fetch = runSSHCommand(
122+
ssh_process_fetch = SSHAccessUtils.runSSHCommand(
121123
hostname, SSH_USERNAME, SSH_PASSWORD, fetch_command)
122124
if not ssh_process_fetch['success']:
123125
return CHECK.UNDETERMINABLE, None
124126

125127
command = f"cd {EPICS_DIR} && git log --format=\"%h %s\" {branch_details}"
126128

127-
ssh_process = runSSHCommand(hostname, SSH_USERNAME, SSH_PASSWORD, command)
129+
ssh_process = SSHAccessUtils.runSSHCommand(
130+
hostname, SSH_USERNAME, SSH_PASSWORD, command)
128131

129132
commit_dict = {}
130133

0 commit comments

Comments
 (0)