Merge branch '16826-unlogged-attrs-fix'

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index eee41901162b9175f16801550cb076eaeda687c5..8f5762b8dabcbe102bc4ab94435bb5c2bd074a78 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -104,7 +104,7 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
                        "ca-certificates",
                        "cadaver",
                        "curl",
-                       "cython",
+                       "cython3",
                        "daemontools", // lib/boot uses setuidgid to drop privileges when running as root
                        "default-jdk-headless",
                        "default-jre-headless",
@@ -127,7 +127,6 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
                        "libpam-dev",
                        "libpcre3-dev",
                        "libpq-dev",
-                       "libpython2.7-dev",
                        "libreadline-dev",
                        "libssl-dev",
                        "libwww-perl",
@@ -142,13 +141,13 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
                        "pkg-config",
                        "postgresql",
                        "postgresql-contrib",
-                       "python",
                        "python3-dev",
                        "python-epydoc",
                        "r-base",
                        "r-cran-testthat",
                        "sudo",
-                       "virtualenv",
+                       "python3-virtualenv",
+                       "python3-venv",
                        "wget",
                        "xvfb",
                        "zlib1g-dev",
@@ -327,6 +326,7 @@ rm ${zip}
                        // might never have been run.
                }
 
+               var needcoll []string
                // If the en_US.UTF-8 locale wasn't installed when
                // postgresql initdb ran, it needs to be added
                // explicitly before we can use it in our test suite.
@@ -341,31 +341,34 @@ rm ${zip}
                        if strings.Contains(string(out), "1") {
                                logger.Infof("postgresql supports collation %s", collname)
                        } else {
-                               // In order for CREATE COLLATION to
-                               // work, the locale must have existed
-                               // when PostgreSQL started up. In most
-                               // cases, either this is already true
-                               // because we just started postgresql
-                               // ourselves above, or systemd is here
-                               // and we can force a restart.
-                               if os.Getpid() != 1 {
-                                       if err = runBash(`sudo systemctl restart postgresql`, stdout, stderr); err != nil {
-                                               logger.Warn("`systemctl restart postgresql` failed; hoping postgresql does not need to be restarted")
-                                       } else if err = waitPostgreSQLReady(); err != nil {
-                                               return 1
-                                       }
-                               }
-                               cmd = exec.Command("sudo", "-u", "postgres", "psql", "-c", "CREATE COLLATION \""+collname+"\" (LOCALE = \"en_US.UTF-8\")")
-                               cmd.Stdout = stdout
-                               cmd.Stderr = stderr
-                               cmd.Dir = "/"
-                               err = cmd.Run()
-                               if err != nil {
-                                       err = fmt.Errorf("error adding postgresql collation %s: %s", collname, err)
-                                       return 1
-                               }
+                               needcoll = append(needcoll, collname)
+                       }
+               }
+               if len(needcoll) > 0 && os.Getpid() != 1 {
+                       // In order for the CREATE COLLATION statement
+                       // below to work, the locale must have existed
+                       // when PostgreSQL started up. If we're
+                       // running as init, we must have started
+                       // PostgreSQL ourselves after installing the
+                       // locales. Otherwise, it might need a
+                       // restart, so we attempt to restart it with
+                       // systemd.
+                       if err = runBash(`sudo systemctl restart postgresql`, stdout, stderr); err != nil {
+                               logger.Warn("`systemctl restart postgresql` failed; hoping postgresql does not need to be restarted")
+                       } else if err = waitPostgreSQLReady(); err != nil {
+                               return 1
+                       }
+               }
+               for _, collname := range needcoll {
+                       cmd := exec.Command("sudo", "-u", "postgres", "psql", "-c", "CREATE COLLATION \""+collname+"\" (LOCALE = \"en_US.UTF-8\")")
+                       cmd.Stdout = stdout
+                       cmd.Stderr = stderr
+                       cmd.Dir = "/"
+                       err = cmd.Run()
+                       if err != nil {
+                               err = fmt.Errorf("error adding postgresql collation %s: %s", collname, err)
+                               return 1
                        }
-
                }
 
                withstuff := "WITH LOGIN SUPERUSER ENCRYPTED PASSWORD " + pq.QuoteLiteral(devtestDatabasePassword)