15954: Cleanup.
authorTom Clegg <tom@tomclegg.ca>
Mon, 24 Feb 2020 20:27:10 +0000 (15:27 -0500)
committerTom Clegg <tom@tomclegg.ca>
Mon, 24 Feb 2020 20:30:07 +0000 (15:30 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

lib/boot/postgresql.go

index ed5aecd09faaa1dd2562cd8330d28b3b7427cce5..9f0de2dd67ef734d9779ebbe80c08aa7cad36217 100644 (file)
@@ -36,14 +36,13 @@ func (runPostgreSQL) Run(ctx context.Context, fail func(error), boot *Booter) er
        if err != nil {
                return err
        }
-       datadir := filepath.Join(boot.tempdir, "pgdata")
+       bindir := strings.TrimSpace(buf.String())
 
+       datadir := filepath.Join(boot.tempdir, "pgdata")
        err = os.Mkdir(datadir, 0755)
        if err != nil {
                return err
        }
-       bindir := strings.TrimSpace(buf.String())
-
        err = boot.RunProgram(ctx, boot.tempdir, nil, nil, filepath.Join(bindir, "initdb"), "-D", datadir)
        if err != nil {
                return err