linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add whatsthere.py to RELEASE-3_2

Browse Source
This commit is contained in:
Douglas Clowes
2014-10-22 12:47:30 +11:00
parent d7d8204dc0
commit 000e799800
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
site_ansto/instrument/util/whatsthere.py
View File

@@ -38,14 +38,14 @@ class Instrument(object):
self.full_deployed_hash = None self.full_deployed_hash = None
self.full_built_hash = None self.full_built_hash = None
try: try:
self.full_deployed_hash = repo.commit(self.deployed_hash).hexsha self.full_deployed_hash = repo.commit(self.deployed_hash.split('+')[0]).hexsha
for ref in repo.refs: for ref in repo.refs:
if ref.commit.hexsha == self.full_deployed_hash: if ref.commit.hexsha == self.full_deployed_hash:
self.deployed_refs.append(ref) self.deployed_refs.append(ref)
except: except:
pass pass
try: try:
self.full_built_hash = repo.commit(self.built_hash).hexsha self.full_built_hash = repo.commit(self.built_hash.split('+')[0]).hexsha
for ref in repo.refs: for ref in repo.refs:
if ref.commit.hexsha == self.full_built_hash: if ref.commit.hexsha == self.full_built_hash:
self.built_refs.append(ref) self.built_refs.append(ref)
@@ -145,6 +145,7 @@ def main_program():
parser.add_argument("-n", "--newserver", action="store_true", help="use newserver instead of server") parser.add_argument("-n", "--newserver", action="store_true", help="use newserver instead of server")
parser.add_argument("-t", "--test", action="store_true", help="add -test to host") parser.add_argument("-t", "--test", action="store_true", help="add -test to host")
parser.add_argument("-v", "--verbose", action="store_true", help="more output") parser.add_argument("-v", "--verbose", action="store_true", help="more output")
parser.add_argument("-d", "--directory", default="server", help="use directory instead of server [server]")
parser.add_argument("targets", nargs="*", help="select host target") parser.add_argument("targets", nargs="*", help="select host target")
args = parser.parse_args() args = parser.parse_args()
Test = False Test = False
@@ -161,10 +162,10 @@ def main_program():
cmd_list += ["stat --printf=%y" + "\\" * 4 + "n /usr/local/sics/newserver/SICServer"] cmd_list += ["stat --printf=%y" + "\\" * 4 + "n /usr/local/sics/newserver/SICServer"]
else: else:
cmd_list = [] cmd_list = []
cmd_list += ["cat /usr/local/sics/server/DEPLOYMENT.TXT"] cmd_list += ["cat /usr/local/sics/%s/DEPLOYMENT.TXT" % args.directory]
cmd_list += ["/usr/local/sics/server/SICServer -v"] cmd_list += ["/usr/local/sics/%s/SICServer -v" % args.directory]
cmd_list += ["stat --printf=%y" + "\\" * 4 + "n /usr/local/sics/server/SICServer"] cmd_list += ["stat --printf=%y" + ("\\" * 4 + "n") + (" /usr/local/sics/%s/SICServer" % args.directory)]
repo = git.Repo() repo = git.Repo()
if len(args.targets) > 0: if len(args.targets) > 0:
selected_hosts = [] selected_hosts = []