Skip to content

Commit

Permalink
fix config tarPost
Browse files Browse the repository at this point in the history
  • Loading branch information
albertmena committed Feb 9, 2024
1 parent 990c08e commit c84d95d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion installer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def compileXmippRun(source:str, sourceError:str, compileLines:list, sconsPath:st
retCode, outputStr = runJob(
f"/usr/bin/env python3 -u {sconsPath} -j{jobs}",
f"src/{source}",
streaming=True, showOutput=True, showError=False,
streaming=True, showOutput=True, showError=True,
linesCompileBar=compileLines)
if retCode != 0:
exitError(retCode=sourceError, output=outputStr)
Expand Down
3 changes: 2 additions & 1 deletion installer/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,7 @@ def runStreamingJob(cmd: str, cwd: str='./', showOutput: bool=False,
if error:
printError(errorText)


# Return result
return process.returncode, outputStr

Expand All @@ -862,7 +863,7 @@ def writeProcessOutput(process: subprocess.Popen, readerOut: io.FileIO,
# Get process running status and print output
isProcessFinished = process.poll() is not None
outputStr += writeReaderLine(readerOut, show=False)
outputStr += writeReaderLine(readerErr, show=showError, err=True)
outputStr += writeReaderLine(readerErr, show=False, err=True)
if linesCompileBar:
if outputStr.count('is up to date') > 4:
lines = linesCompileBar[1]
Expand Down

0 comments on commit c84d95d

Please sign in to comment.