Alon Bar-Lev has uploaded a new change for review.

Change subject: db: cleanup: rename commons to consistent prefix
......................................................................

db: cleanup: rename commons to consistent prefix

dbfunctions.sh -> dbfunc-common.sh
dbcustomfunctions.sh -> dbfunc-custom.sh

Change-Id: I76ee5311eaabf5d7b1b69e780725979730fbca41
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M packaging/dbscripts/cleandb.sh
M packaging/dbscripts/create_schema.sh
R packaging/dbscripts/dbfunc-common.sh
R packaging/dbscripts/dbfunc-custom.sh
M packaging/dbscripts/refreshStoredProcedures.sh
M packaging/dbscripts/unlock_entity.sh
M packaging/dbscripts/upgrade.sh
7 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/25217/1

diff --git a/packaging/dbscripts/cleandb.sh b/packaging/dbscripts/cleandb.sh
index b3856a4..2fad5a6 100755
--- a/packaging/dbscripts/cleandb.sh
+++ b/packaging/dbscripts/cleandb.sh
@@ -6,7 +6,7 @@
 
 #include db general functions
 cd "$(dirname "$0")"
-. ./dbcustomfunctions.sh
+. ./dbfunc-custom.sh
 
 cleanup() {
     dbfunc_cleanup
diff --git a/packaging/dbscripts/create_schema.sh 
b/packaging/dbscripts/create_schema.sh
index 00e5133..88477d7 100755
--- a/packaging/dbscripts/create_schema.sh
+++ b/packaging/dbscripts/create_schema.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd "$(dirname "$0")"
-. ./dbcustomfunctions.sh
+. ./dbfunc-custom.sh
 
 cleanup() {
     dbfunc_cleanup
diff --git a/packaging/dbscripts/dbfunctions.sh 
b/packaging/dbscripts/dbfunc-common.sh
similarity index 100%
rename from packaging/dbscripts/dbfunctions.sh
rename to packaging/dbscripts/dbfunc-common.sh
diff --git a/packaging/dbscripts/dbcustomfunctions.sh 
b/packaging/dbscripts/dbfunc-custom.sh
similarity index 97%
rename from packaging/dbscripts/dbcustomfunctions.sh
rename to packaging/dbscripts/dbfunc-custom.sh
index b804234..980f75c 100644
--- a/packaging/dbscripts/dbcustomfunctions.sh
+++ b/packaging/dbscripts/dbfunc-custom.sh
@@ -1,5 +1,5 @@
 
-. ./dbfunctions.sh
+. ./dbfunc-common.sh
 
 DBFUNC_DB_USER="${DBFUNC_DB_USER:-engine}"
 DBFUNC_DB_DATABASE="${DBFUNC_DB_DATABASE:-engine}"
diff --git a/packaging/dbscripts/refreshStoredProcedures.sh 
b/packaging/dbscripts/refreshStoredProcedures.sh
index 8bc69ec..a80f81c 100755
--- a/packaging/dbscripts/refreshStoredProcedures.sh
+++ b/packaging/dbscripts/refreshStoredProcedures.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd "$(dirname "$0")"
-. ./dbcustomfunctions.sh
+. ./dbfunc-custom.sh
 
 cleanup() {
     dbfunc_cleanup
diff --git a/packaging/dbscripts/unlock_entity.sh 
b/packaging/dbscripts/unlock_entity.sh
index 015b628..f9a3716 100755
--- a/packaging/dbscripts/unlock_entity.sh
+++ b/packaging/dbscripts/unlock_entity.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd "$(dirname "$0")"
-. ./dbcustomfunctions.sh
+. ./dbfunc-custom.sh
 
 cleanup() {
     dbfunc_cleanup
diff --git a/packaging/dbscripts/upgrade.sh b/packaging/dbscripts/upgrade.sh
index a367411..8a17d18 100755
--- a/packaging/dbscripts/upgrade.sh
+++ b/packaging/dbscripts/upgrade.sh
@@ -32,7 +32,7 @@
 
 #include db general functions
 cd "$(dirname "$0")"
-. ./dbcustomfunctions.sh
+. ./dbfunc-custom.sh
 
 cleanup() {
     dbfunc_cleanup


-- 
To view, visit http://gerrit.ovirt.org/25217
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76ee5311eaabf5d7b1b69e780725979730fbca41
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to