[ARVADOS] updated: 1.3.0-2305-gbb3339bdb

[Git user]

Summary of changes:
 lib/boot/passenger.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  bb3339bdbfff4f41c7b831b78aeb1288ba6431c2 (commit)
      from  96d7a9fbb405bb36839bc4f33bf40119794f66b4 (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 bb3339bdbfff4f41c7b831b78aeb1288ba6431c2
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu Feb 27 16:39:02 2020 -0500

    15954: Ignore warnings from passenger-config validate-install.
    
    Otherwise, an existing passenger installation (system-wide or in an
    rvm gemset) causes cluster startup to fail.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 41805ba2b..33afb721d 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -67,7 +67,11 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 		return err
 	}
 	err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec", "passenger-config", "validate-install")
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "exit status 2") {
+		// Exit code 2 indicates there were warnings (like
+		// "other passenger installations have been detected",
+		// which we can't expect to avoid) but no errors.
+		// Other non-zero exit codes (1, 9) indicate errors.
 		return err
 	}
 	return nil

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


hooks/post-receive
--