[ovirt-engine/f18] Fix the patch to check for PostgreSQL 9
Juan Hernandez
jhernand at fedoraproject.org
Thu Dec 6 15:41:59 UTC 2012
commit 5f9944c471b9e37a697994a87cd267c8678cf0fd
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Thu Dec 6 16:32:55 2012 +0100
Fix the patch to check for PostgreSQL 9
The check is in two different places, and both need to be fixed.
ovirt-engine-check-for-postgresql-9-not-91.patch | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/ovirt-engine-check-for-postgresql-9-not-91.patch b/ovirt-engine-check-for-postgresql-9-not-91.patch
index 6c94b52..22f342b 100644
--- a/ovirt-engine-check-for-postgresql-9-not-91.patch
+++ b/ovirt-engine-check-for-postgresql-9-not-91.patch
@@ -1,4 +1,4 @@
-From 90f4704144272c5adfcbae31a132b20079c1b0ef Mon Sep 17 00:00:00 2001
+From bb35da06fd8593539a2f712d3a5ffdaccf82ac5f Mon Sep 17 00:00:00 2001
From: Juan Hernandez <juan.hernandez at redhat.com>
Date: Thu, 6 Dec 2012 14:59:28 +0100
Subject: [PATCH] Check for PostgreSQL 9.*, not 9.1
@@ -15,9 +15,23 @@ number starts with "9.", this should work correctly in Fedora 18.
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
---
+ backend/manager/dbscripts/dbfunctions.sh | 2 +-
backend/manager/dbscripts/engine-db-install.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/backend/manager/dbscripts/dbfunctions.sh b/backend/manager/dbscripts/dbfunctions.sh
+index 0824760..749b916 100755
+--- a/backend/manager/dbscripts/dbfunctions.sh
++++ b/backend/manager/dbscripts/dbfunctions.sh
+@@ -326,7 +326,7 @@ check_and_install_uuid_osspa_pg9() {
+
+ check_and_install_uuid_osspa() {
+
+- if [ $(pg_version | egrep "^9.1") ]; then
++ if [ $(pg_version | egrep "^9\.") ]; then
+ echo "Creating uuid-ossp extension..."
+ check_and_install_uuid_osspa_pg9 $1
+ else
diff --git a/backend/manager/dbscripts/engine-db-install.sh b/backend/manager/dbscripts/engine-db-install.sh
index fe17273..add9e24 100755
--- a/backend/manager/dbscripts/engine-db-install.sh
More information about the scm-commits
mailing list