diff --git a/ci/buildWorker.go b/ci/buildWorker.go index 3bf53a1..b54a8fa 100644 --- a/ci/buildWorker.go +++ b/ci/buildWorker.go @@ -67,7 +67,7 @@ func (worker *buildWorker) start() { logFilename = path.Join(worker.session.tmpDir, "port-"+subport+"-install.log") logger.GlobalLogger.LogChan <- &logger.LogText{"port-" + subport + "-install-start", nil} - err = mpbbToLog("install-port", subport, portTmpDir, logFilename) + err = mpbbToLog("install-port", subport, portTmpDir, logFilename, "--source") if err != nil { if eerr, ok := err.(*exec.ExitError); ok { if !eerr.Success() { diff --git a/ci/mpbb.go b/ci/mpbb.go index 552a54f..55c570f 100644 --- a/ci/mpbb.go +++ b/ci/mpbb.go @@ -29,13 +29,17 @@ func ListSubports(port string) ([]string, error) { } // mpbbToLog executes `mpbb` and saves output to a file at logFilePath. -func mpbbToLog(command, port, workDir, logFilePath string) error { +func mpbbToLog(command, port, workDir, logFilePath string, commandArg ...string) error { var mpbbCmd *exec.Cmd + args := make([]string, 0, 2) if workDir != "" { - mpbbCmd = exec.Command("mpbb", "--work-dir", workDir, command, port) - } else { - mpbbCmd = exec.Command("mpbb", command, port) + args = append(args, "--work-dir", workDir) } + args = append(args, command) + args = append(args, commandArg...) + args = append(args, port) + + mpbbCmd = exec.Command("mpbb", args...) logFile, err := os.Create(logFilePath) if err != nil {