Bug#385034: postgresql-common: pg_upgradecluster passes datadir incorrectly to pg_createcluster

[Bastian Kleineidam]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I created a patch for this bug. Could someone please test this?

Regards,
  Bastian
- --
  ,''`.                  Bastian Kleineidam
 : :' :                    GnuPG Schlüssel
 `. `'    gpg --keyserver wwwkeys.pgp.net --recv-keys 32EC6F3E
   `-

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE/aiReBwlBDLsbz4RAvj4AJoDjP3froBPGVllroI/T0FzJq784gCgqrWa
HtWEI+IXZoxgEFdjG4haoxY=
=+ia6
-----END PGP SIGNATURE-----

--- /usr/bin/pg_upgradecluster.orig     2006-09-05 15:29:06.000000000 +0200
+++ /usr/bin/pg_upgradecluster  2006-09-05 15:30:05.000000000 +0200
@@ -209,9 +209,9 @@
 # create new cluster, preserving encoding and locales
 
 my @argv = ('pg_createcluster', '-u', $info{'owneruid'}, '-g', 
$info{'ownergid'},
-    '--socketdir', $info{'socketdir'}, '--encoding', $encoding, $newversion,
-    $cluster);
-push @argv, $datadir if $datadir;
+    '--socketdir', $info{'socketdir'}, '--encoding', $encoding);
+push @argv, '--datadir', $datadir if $datadir;
+push @argv, $newversion, $cluster;
 
 delete $ENV{'LC_ALL'};
 $ENV{'LC_CTYPE'} = $lc_ctype;