[ARVADOS] updated: 2.1.0-2167-ge28233a15

[Git user]

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

       via  e28233a15116ea3c0c86d0216c686215eb2ef6c7 (commit)
       via  39ccb1fe43f8ccfba43879ce1a3a17f9520463b6 (commit)
      from  63ad24fa4b86c7a2fe033f6ef809091dbf4f138c (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 e28233a15116ea3c0c86d0216c686215eb2ef6c7
Author: Tom Clegg <tom at curii.com>
Date:   Tue Mar 29 09:58:17 2022 -0400

    18700: Discard local yarn.lock modifications when checking out wb2.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index b38db9919..069ffd0a2 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -497,6 +497,7 @@ else
   cd arvados-workbench2
   if ! git checkout $V; then
     git fetch
+    git checkout yarn.lock
     git checkout $V
   fi
 fi

commit 39ccb1fe43f8ccfba43879ce1a3a17f9520463b6
Author: Tom Clegg <tom at curii.com>
Date:   Tue Mar 29 09:51:19 2022 -0400

    18700: Update perl-modules package name for debian 11.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 2aa77f0a2..b38db9919 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -172,7 +172,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"make",
 			"net-tools",
 			"pandoc",
-			"perl-modules",
 			"pkg-config",
 			"postgresql",
 			"postgresql-contrib",
@@ -203,9 +202,9 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 		}
 		switch {
 		case osv.Debian && osv.Major >= 10:
-			pkgs = append(pkgs, "libcurl4")
+			pkgs = append(pkgs, "libcurl4", "perl-modules-5.32")
 		default:
-			pkgs = append(pkgs, "libcurl3")
+			pkgs = append(pkgs, "libcurl3", "perl-modules")
 		}
 		cmd := exec.CommandContext(ctx, "apt-get")
 		if inst.EatMyData {

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


hooks/post-receive
--