Updated function calls in srcupdater

This commit is contained in:
Jeff Wallace 2013-07-19 08:15:25 -04:00
parent dc7fcb3790
commit 317a31b47f

View File

@ -14,6 +14,7 @@ import traceback
import xml import xml
from xml.dom.minidom import parse, parseString from xml.dom.minidom import parse, parseString
import Emailer import Emailer
from regression_utils import *
def compile(errore, attachli, parsedin): def compile(errore, attachli, parsedin):
global redo global redo
@ -62,7 +63,7 @@ def gitPull(TskOrAutopsy):
global errorem global errorem
global attachl global attachl
ccwd = "" ccwd = ""
gppth = Emailer.make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt")
attachl.append(gppth) attachl.append(gppth)
gpout = open(gppth, 'a') gpout = open(gppth, 'a')
toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy
@ -92,7 +93,7 @@ def vsBuild():
vs.append("/t:clean") vs.append("/t:clean")
vs.append("/t:rebuild") vs.append("/t:rebuild")
print(vs) print(vs)
VSpth = Emailer.make_local_path("..", "VSOutput.txt") VSpth = make_local_path("..", "VSOutput.txt")
VSout = open(VSpth, 'a') VSout = open(VSpth, 'a')
subprocess.call(vs, stdout=VSout) subprocess.call(vs, stdout=VSout)
VSout.close() VSout.close()
@ -106,7 +107,7 @@ def vsBuild():
if(not tryredo): if(not tryredo):
errorem += "LIBTSK C++ failed to build.\n" errorem += "LIBTSK C++ failed to build.\n"
attachl.append(VSpth) attachl.append(VSpth)
Emailer.send_email(parsed, errorem, attachl, False) send_email(parsed, errorem, attachl, False)
tryredo = True tryredo = True
passed = False passed = False
redo = True redo = True
@ -131,7 +132,7 @@ def antBuild(which, Build):
ant.append("build") ant.append("build")
else: else:
ant.append("dist") ant.append("dist")
antpth = Emailer.make_local_path("..", "ant" + which + "Output.txt") antpth = make_local_path("..", "ant" + which + "Output.txt")
antout = open(antpth, 'a') antout = open(antpth, 'a')
succd = subprocess.call(ant, stdout=antout) succd = subprocess.call(ant, stdout=antout)
antout.close() antout.close()