[ARVADOS] updated: 1.3.0-2501-g26d99751d

Git user git at public.arvados.org
Sat Apr 18 01:55:45 UTC 2020


Summary of changes:
 lib/install/deps.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  26d99751d6c091d9a554770c6572aa629f55d3cb (commit)
      from  3c66181800cb050c699166e245ab8a3bf20fe4e2 (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 26d99751d6c091d9a554770c6572aa629f55d3cb
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 17 21:14:42 2020 -0400

    16267: Fix apt-get flags
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index bf4137872..902e84744 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -163,7 +163,12 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
 		if *rubyInst == "package" {
 			debs = append(debs, "ruby", "ruby-dev", "bundler")
 		}
-		cmd := exec.CommandContext(ctx, "apt-get", "install", "--yes", "--no-install-recommends")
+		cmd := exec.CommandContext(ctx, "apt-get",
+			"--yes",
+			"--quiet",
+			"--no-install-recommends",
+			"-o", "Acquire::Retries=6",
+			"install")
 		cmd.Args = append(cmd.Args, debs...)
 		cmd.Env = append(os.Environ(), "DEBIAN_FRONTEND=noninteractive")
 		cmd.Stdout = stdout
@@ -174,7 +179,7 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
 		}
 	}
 
-	os.Mkdir("/var/lib/arvados", 0755)
+	os.Mkdir("/var/lib/arvados/bin", 0755)
 	if *rubyInst == "source" {
 		rubyversion := "2.5.7"
 		if haverubyversion, err := exec.Command("/var/lib/arvados/bin/ruby", "-v").CombinedOutput(); err == nil && bytes.HasPrefix(haverubyversion, []byte("ruby "+rubyversion)) {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list