[ARVADOS] updated: 1.1.2-26-gb9851a9

Git user git at public.curoverse.com
Sun Jan 7 20:49:47 EST 2018


Summary of changes:
 build/run-tests.sh  | 10 ++++++++--
 lib/cli/external.go | 25 +++++++++++++++++++++++++
 lib/cmd/cmd.go      | 13 +++++++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

       via  b9851a978e1a1deb8853f7cd5b02acf7c55a24c8 (commit)
       via  02001807b3a68526f3f1a5de9f4cc87e59993b2a (commit)
       via  3d8da9e64df7c0dd0302b7d2f4d188a9ede9099c (commit)
      from  8f8a0ac695f4440412de0245fc748c2792cb1496 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b9851a978e1a1deb8853f7cd5b02acf7c55a24c8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sun Jan 7 20:40:32 2018 -0500

    12876: Call attention to missing python and ruby dependencies.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/cli/external.go b/lib/cli/external.go
index ba85aae..35933f9 100644
--- a/lib/cli/external.go
+++ b/lib/cli/external.go
@@ -92,8 +92,33 @@ func (ec externalCmd) RunCommand(prog string, args []string, stdin io.Reader, st
 		}
 		fmt.Fprintf(stderr, "%s failed: %s\n", ec.prog, err)
 		return 1
+	case *exec.Error:
+		fmt.Fprintln(stderr, err)
+		if ec.prog == "arv" || ec.prog == "arv-run-pipeline-instance" {
+			fmt.Fprint(stderr, rubyInstallHints)
+		} else if strings.HasPrefix(ec.prog, "arv-") {
+			fmt.Fprint(stderr, pythonInstallHints)
+		}
+		return 1
 	default:
 		fmt.Fprintf(stderr, "error running %s: %s\n", ec.prog, err)
 		return 1
 	}
 }
+
+var (
+	rubyInstallHints = `
+Note: This subcommand uses the arvados-cli Ruby gem. If that is not
+installed, try "gem install arvados-cli", or see
+https://doc.arvados.org/install for more details.
+
+`
+	pythonInstallHints = `
+Note: This subcommand uses the "arvados" Python module. If that is
+not installed, try:
+* "pip install arvados" (either as root or in a virtualenv), or
+* "sudo apt-get install python-arvados-python-client", or
+* see https://doc.arvados.org/install for more details.
+
+`
+)

commit 02001807b3a68526f3f1a5de9f4cc87e59993b2a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sun Jan 7 20:16:46 2018 -0500

    12876: Recover from more symlink confusion.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 90a3abb..e831bf3 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -478,8 +478,14 @@ export PERLLIB="$PERLINSTALLBASE/lib/perl5:${PERLLIB:+$PERLLIB}"
 
 export GOPATH
 mkdir -p "$GOPATH/src/git.curoverse.com"
-rmdir --parents "$GOPATH/src/git.curoverse.com/arvados.git/tmp/GOPATH"
-ln -snfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
+rmdir -v --parents --ignore-fail-on-non-empty "$GOPATH/src/git.curoverse.com/arvados.git/tmp/GOPATH"
+for d in \
+    "$GOPATH/src/git.curoverse.com/arvados.git/arvados.git" \
+    "$GOPATH/src/git.curoverse.com/arvados.git"; do
+    [[ -d "$d" ]] && rmdir "$d"
+    [[ -h "$d" ]] && rm "$d"
+done
+ln -vsnfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
     || fatal "symlink failed"
 go get -v github.com/kardianos/govendor \
     || fatal "govendor install failed"

commit 3d8da9e64df7c0dd0302b7d2f4d188a9ede9099c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sun Jan 7 20:14:02 2018 -0500

    12876: List subcommands like "arvados-client keep get" in main usage.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/cmd/cmd.go b/lib/cmd/cmd.go
index d040065..2cc71e6 100644
--- a/lib/cmd/cmd.go
+++ b/lib/cmd/cmd.go
@@ -56,6 +56,11 @@ func (m Multi) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 }
 
 func (m Multi) Usage(stderr io.Writer) {
+	fmt.Fprintf(stderr, "\nAvailable commands:\n")
+	m.listSubcommands(stderr, "")
+}
+
+func (m Multi) listSubcommands(out io.Writer, prefix string) {
 	var subcommands []string
 	for sc := range m {
 		if strings.HasPrefix(sc, "-") {
@@ -67,9 +72,13 @@ func (m Multi) Usage(stderr io.Writer) {
 		subcommands = append(subcommands, sc)
 	}
 	sort.Strings(subcommands)
-	fmt.Fprintf(stderr, "\nAvailable commands:\n")
 	for _, sc := range subcommands {
-		fmt.Fprintf(stderr, "    %s\n", sc)
+		switch cmd := m[sc].(type) {
+		case Multi:
+			cmd.listSubcommands(out, prefix+sc+" ")
+		default:
+			fmt.Fprintf(out, "    %s%s\n", prefix, sc)
+		}
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list