<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/1d11ab2cc5255b38241f25e86dc20836ca721527">https://github.com/macports/mpbot-github/commit/1d11ab2cc5255b38241f25e86dc20836ca721527</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1d11ab2 ci: use Cmd.Run
</span>1d11ab2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1d11ab2cc5255b38241f25e86dc20836ca721527
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue May 1 06:13:02 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> ci: use Cmd.Run
</span>---
ci/mpbb.go | 7 +++----
ci/portutil.go | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
<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 58758f2..5d219b0 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;'>@@ -19,15 +19,14 @@ func mpbbToLog(command, port, workDir, logFilePath string) error {
</span> if err != nil {
return err
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ defer logFile.Close()
</span> logWriter := bufio.NewWriter(logFile)
// other logs in workDir/logs
mpbbCmd.Stdout = logWriter
mpbbCmd.Stderr = logWriter
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if err = mpbbCmd.Start(); err != nil {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err = mpbbCmd.Run(); err != nil {
</span> return err
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- err = mpbbCmd.Wait()
</span> logWriter.Flush()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- logFile.Close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nil
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ci/portutil.go b/ci/portutil.go
</span><span style='display:block; white-space:pre;color:#808080;'>index b1581a4..3fb1e60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ci/portutil.go
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ci/portutil.go
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,7 @@ import (
</span> // conflicts.
func DeactivateAllPorts() {
deactivateCmd := exec.Command("port", "deactivate", "active")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- deactivateCmd.Start()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deactivateCmd.Wait()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deactivateCmd.Run()
</span> }
// List all subports of a given port.
</pre><pre style='margin:0'>
</pre>