<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch develop
in repository mpbot-github.
</pre>
<p><a href="https://github.com/macports/mpbot-github/commit/04dac5f8501f2bddf2ef8c82d57990631445873b">https://github.com/macports/mpbot-github/commit/04dac5f8501f2bddf2ef8c82d57990631445873b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 04dac5f8501f2bddf2ef8c82d57990631445873b
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Nov 13 13:16:48 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> Force build from source
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/58696
</span>---
ci/buildWorker.go | 2 +-
ci/mpbb.go | 12 ++++++++----
2 files changed, 9 insertions(+), 5 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 3bf53a1..b54a8fa 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;'>@@ -67,7 +67,7 @@ func (worker *buildWorker) start() {
</span>
logFilename = path.Join(worker.session.tmpDir, "port-"+subport+"-install.log")
logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + subport + "-install-start", nil}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- err = mpbbToLog("install-port", subport, portTmpDir, logFilename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = mpbbToLog("install-port", subport, portTmpDir, logFilename, "--source")
</span> if err != nil {
if eerr, ok := err.(*exec.ExitError); ok {
if !eerr.Success() {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ci/mpbb.go b/ci/mpbb.go
</span><span style='display:block; white-space:pre;color:#808080;'>index 552a54f..55c570f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ci/mpbb.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ci/mpbb.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +29,17 @@ func ListSubports(port string) ([]string, error) {
</span> }
// mpbbToLog executes `mpbb` and saves output to a file at logFilePath.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-func mpbbToLog(command, port, workDir, logFilePath string) error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+func mpbbToLog(command, port, workDir, logFilePath string, commandArg ...string) error {
</span> var mpbbCmd *exec.Cmd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ args := make([]string, 0, 2)
</span> if workDir != "" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpbbCmd = exec.Command("mpbb", "--work-dir", workDir, command, port)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpbbCmd = exec.Command("mpbb", command, port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = append(args, "--work-dir", workDir)
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = append(args, command)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = append(args, commandArg...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = append(args, port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpbbCmd = exec.Command("mpbb", args...)
</span>
logFile, err := os.Create(logFilePath)
if err != nil {
</pre><pre style='margin:0'>
</pre>