projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20284: Fix test and update code comment.
[arvados.git]
/
lib
/
boot
/
supervisor.go
diff --git
a/lib/boot/supervisor.go
b/lib/boot/supervisor.go
index 0f0600f181d7e4371687f921f0f2ca318db80546..e913a7fe0894875d490a933a86030e3a74f7e23b 100644
(file)
--- a/
lib/boot/supervisor.go
+++ b/
lib/boot/supervisor.go
@@
-61,8
+61,7
@@
type Supervisor struct {
// explicitly configured in config file. If blank, use a
// random port on ListenHost.
ControllerAddr string
// explicitly configured in config file. If blank, use a
// random port on ListenHost.
ControllerAddr string
- // Path to arvados-workbench2 source tree checkout.
- Workbench2Source string
+
NoWorkbench1 bool
NoWorkbench2 bool
OwnTemporaryDatabase bool
NoWorkbench1 bool
NoWorkbench2 bool
OwnTemporaryDatabase bool
@@
-325,13
+324,13
@@
func (super *Supervisor) runCluster() error {
} else if super.SourceVersion == "" {
// Find current source tree version.
var buf bytes.Buffer
} else if super.SourceVersion == "" {
// Find current source tree version.
var buf bytes.Buffer
- err = super.RunProgram(super.ctx,
"."
, runOptions{output: &buf}, "git", "diff", "--shortstat")
+ err = super.RunProgram(super.ctx,
super.SourcePath
, runOptions{output: &buf}, "git", "diff", "--shortstat")
if err != nil {
return err
}
dirty := buf.Len() > 0
buf.Reset()
if err != nil {
return err
}
dirty := buf.Len() > 0
buf.Reset()
- err = super.RunProgram(super.ctx,
"."
, runOptions{output: &buf}, "git", "log", "-n1", "--format=%H")
+ err = super.RunProgram(super.ctx,
super.SourcePath
, runOptions{output: &buf}, "git", "log", "-n1", "--format=%H")
if err != nil {
return err
}
if err != nil {
return err
}