summaryrefslogtreecommitdiffstats
path: root/lib_pgsql.sh
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2014-10-03 14:44:34 +0200
committerPavel Raiskup <praiskup@redhat.com>2014-10-03 14:44:34 +0200
commit98df0c8b79a964c94df0c7b731fe790073214eba (patch)
treef0404c3b9997a29130ebe9ce908c609b865653b4 /lib_pgsql.sh
parentdd52a3df190ad677e23654dbba8bf553565a159b (diff)
downloadpostgresql-setup-tests-98df0c8b79a964c94df0c7b731fe790073214eba.tar.gz
postgresql-setup-tests-98df0c8b79a964c94df0c7b731fe790073214eba.tar.xz
postgresql-setup-tests-98df0c8b79a964c94df0c7b731fe790073214eba.zip
tasks/initdb: fixes for f20
Older versions of postgresql-setup do not support --initdb option. * lib_pgsql.sh (dtf_postgresql_phase_cleanup): Do not fail when the data directory is not created by test. * tasks/initdb/runtest.sh: Avoid running this test on older RHEL/Fedora systems.
Diffstat (limited to 'lib_pgsql.sh')
-rw-r--r--lib_pgsql.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_pgsql.sh b/lib_pgsql.sh
index 9db69d1..3e8e047 100644
--- a/lib_pgsql.sh
+++ b/lib_pgsql.sh
@@ -22,7 +22,7 @@ dtf_postgresql_phase_cleanup()
rlPhaseStartCleanup
rlServiceStop postgresql
dtf_postgresql_check_stopped
- rlRun "rm -r /var/lib/pgsql/data"
+ rlRun "rm -rf /var/lib/pgsql/data"
rlPhaseEnd
}