~ubuntu-branches/debian/experimental/postgresql-common/experimental

« back to all changes in this revision

Viewing changes to PgCommon.pm

  • Committer: Package Import Robot
  • Author(s): Christoph Berg, Martin Pitt, Christoph Berg
  • Date: 2013-01-31 10:36:41 UTC
  • Revision ID: package-import@ubuntu.com-20130131103641-s9abi4roc3ac51hu
Tags: 140
[ Martin Pitt ]
* t/001_packages.t: Also check that -contrib is installed.
* debian/backport-ppa: Backport -common for Ubuntu 12.10.
* PgCommon.pm: Recognize "include_if_exists" directive. (LP: #1098986)
* pg_ctlcluster: Recreate a missing /var/log/postgresql/ if needed.
  (LP: #1009989)
* debian/postgresql-client-common.links: Wrap pgbench with pg_wrapper.
  (LP: #1068194)

[ Christoph Berg ]
* testsuite: The default list of umasks to test (022 077) can be overridden
  by setting the environment variable PG_UMASKS.
* t/003_package_checks.t: Ensure psql is linked against libedit.
* t/005_PgCommon.t: Increase sleep time after netcat launch to 200ms.
* t/020_create_sql_remove.t: Test process title update.
* pg_createcluster: Allow passing of initdb arguments on the command line.
  If --auth parameters are passed, skip updating the generated pg_hba.conf
  file.
* pg_virtualenv: Allow passing initdb arguments to pg_createcluster.
* pg_upgradecluster: Print a helpful message when invoked on the target
  version. Problem seen on #postgresql.
* t/030_errors.t: Adjust testsuite for this.
* debian/supported-versions: Handle unset variables from /etc/os-release
  gracefully. Spotted by x4rlos on #postgresql.
* pg_buildext: Set USE_PGXS=1, and srcdir (needed by plr).

Show diffs side-by-side

added added

removed removed

Lines of Context:
105
105
        while (<F>) {
106
106
            if (/^\s*(?:#.*)?$/) {
107
107
                next;
108
 
            } elsif (/^\s*include\s+'([^']+)'\s*$/i) {
 
108
            } elsif (/^\s*include(?:_if_exists)?\s+'([^']+)'\s*$/i) {
109
109
                my ($k, $v, $path, %include_conf);
110
110
                $path = $1;
111
111
                unless (substr($path, 0, 1) eq '/') {