From ab490975e479fe92c2df4dea6a6e814618fc2c7c Mon Sep 17 00:00:00 2001
From: Christoph Berg <myon@debian.org>
Date: Fri, 4 Jan 2013 13:51:58 +0100
Subject: [PATCH] pg_wrapper: Document that PGHOST overrides PGCLUSTER.
(Closes: #697291)
---
debian/changelog | 1 +
pg_wrapper | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e01e1b01..089e3392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ postgresql-common (139) UNRELEASED; urgency=low
the ipv6 for perl <= 5.10 (i.e. on squeeze and lucid).
* PgCommon.pm, pg_ctlcluster, pg_createcluster, t/030_errors.t: 9.3 renames
unix_socket_directory to unix_socket_directories.
+ * pg_wrapper: Document that PGHOST overrides PGCLUSTER. (Closes: #697291)
[ Martin Pitt ]
* debian/supported-versions: Read /etc/os-release if present, and fall back
diff --git a/pg_wrapper b/pg_wrapper
index 97944a98..7e2113e3 100755
--- a/pg_wrapper
+++ b/pg_wrapper
@@ -4,6 +4,7 @@
# /etc/postgresql-common/user_clusters.
#
# (C) 2005-2009 Martin Pitt <mpitt@debian.org>
+# (C) 2013 Christoph Berg <myon@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -173,23 +174,29 @@ explicit specification with the B<--cluster> option
=item 2.
-explicit specification with the B<PGCLUSTER> environment variable
+if the B<PGHOST> environment variable is set, no further cluster selection is
+performed. The default PostgreSQL version and port number (from the environment
+variable B<PGPORT>, or default 5432) will be used.
=item 3.
+explicit specification with the B<PGCLUSTER> environment variable
+
+=item 4.
+
matching entry in C<~/.postgresqlrc> (see L<postgresqlrc(5)>), if that
file exists
-=item 4.
+=item 5.
matching entry in C</etc/postgresql-common/user_clusters> (see
L<user_clusters(5)>), if that file exists
-=item 5.
+=item 6.
If only one local cluster exists, that one will be selected.
-=item 6.
+=item 7.
If several local clusters exist, the one listening on the default port 5432
will be selected.
--
GitLab