[ARVADOS] updated: 134a2fae0f769f721e1f255d5e8089a68bb797d5

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  134a2fae0f769f721e1f255d5e8089a68bb797d5 (commit)
      from  91143ef549e065ebdfb0138a031fc1fbd65cb527 (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 134a2fae0f769f721e1f255d5e8089a68bb797d5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 27 14:21:32 2017 -0400

    12246: Make "possible causes" message easier to find and read.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 080a0fc..3fdd374 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -859,9 +859,9 @@ func (runner *ContainerRunner) StartContainer() error {
 	if err != nil {
 		var advice string
 		if strings.Contains(err.Error(), "no such file or directory") {
-			advice = fmt.Sprintf(" (perhaps command %q is missing, or has a missing #! interpreter, or was saved in DOS mode with cr-lf chars?)", runner.Container.Command[0])
+			advice = fmt.Sprintf("\nPossible causes: command %q is missing, the interpreter given in #! is missing, or script has Windows line endings.", runner.Container.Command[0])
 		}
-		return fmt.Errorf("could not start container%s: %v", advice, err)
+		return fmt.Errorf("could not start container: %v%s", err, advice)
 	}
 	runner.cStarted = true
 	return nil

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


hooks/post-receive
--