20846: Fix dependencies for ubuntu 22.04.
authorTom Clegg <tom@curii.com>
Tue, 24 Oct 2023 19:06:01 +0000 (15:06 -0400)
committerTom Clegg <tom@curii.com>
Fri, 3 Nov 2023 20:00:11 +0000 (16:00 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/install/deps.go

index 5fecc5794eb10859056b731ac1722c07cda3225c..fc0062cd754b032101dc0f7cdad6052373d3b95c 100644 (file)
@@ -208,9 +208,8 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                                "gnupg")          // docker install recipe
                }
                switch {
-               case osv.Debian && osv.Major >= 11:
-                       pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
-               case osv.Debian && osv.Major >= 10:
+               case osv.Debian && osv.Major >= 10,
+                       osv.Ubuntu && osv.Major >= 22:
                        pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev")
                case osv.Debian || osv.Ubuntu:
                        pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev")