<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository mpbot-github.
</pre>
<p><a href="https://github.com/macports/mpbot-github/commit/d238ec3b1abe47d26ab27a1089bd4ed435e46370">https://github.com/macports/mpbot-github/commit/d238ec3b1abe47d26ab27a1089bd4ed435e46370</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d238ec3b1abe47d26ab27a1089bd4ed435e46370
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Mar 17 06:09:11 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> ci: Use subport in field name
</span>---
ci/buildWorker.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ci/buildWorker.go b/ci/buildWorker.go
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a50c3a..905e309 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ci/buildWorker.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ci/buildWorker.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ func (worker *buildWorker) start() {
</span> DeactivateAllPorts()
portTmpDir := path.Join(worker.session.tmpDir, subport)
logFilename := path.Join(worker.session.tmpDir, "port-"+subport+"-dep-install.log")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + port + "-dep-install-start", nil}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + subport + "-dep-install-start", nil}
</span> err := mpbbToLog("install-dependencies", subport, portTmpDir, logFilename)
if err != nil {
if eerr, ok := err.(*exec.ExitError); ok {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ func (worker *buildWorker) start() {
</span> }
if err != nil {
logger.GlobalLogger.LogChan <- &logger.LogFile{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FieldName: "port-" + port + "-dep-install-output-" + statusString,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FieldName: "port-" + subport + "-dep-install-output-" + statusString,
</span> Filename: logFilename,
Big: true,
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ func (worker *buildWorker) start() {
</span> }
logFilename = path.Join(worker.session.tmpDir, "port-"+subport+"-install.log")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + port + "-install-start", nil}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + subport + "-install-start", nil}
</span> err = mpbbToLog("install-port", subport, portTmpDir, logFilename)
if err != nil {
if eerr, ok := err.(*exec.ExitError); ok {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ func (worker *buildWorker) start() {
</span> Filename: path.Join(portTmpDir, "logs/ports-progress.txt"),
}
logger.GlobalLogger.LogChan <- &logger.LogFile{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FieldName: "port-" + port + "-install-output-" + statusString,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FieldName: "port-" + subport + "-install-output-" + statusString,
</span> Filename: logFilename,
Big: true,
}
</pre><pre style='margin:0'>
</pre>