Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: moving unlock_entity.sh to setup rpm ......................................................................
packaging: setup: moving unlock_entity.sh to setup rpm Currently unlock_entity.sh is packet in ovirt-engine-dbscripts moving to ovirt-engine-setup-plugin-ovirt-engine so that it will become available also on upgrades (ovirt-engine-dbscripts is kept under versionlock till advanced engine-setup stages). Fixing common code references. Change-Id: Icd42d154765aa15fca15b68ea9a0eae592dcd0a4 Signed-off-by: Simone Tiraboschi <[email protected]> --- R packaging/setup/dbutils/unlock_entity.sh M packaging/setup/ovirt_engine_setup/engine/constants.py 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/39687/1 diff --git a/packaging/dbscripts/unlock_entity.sh b/packaging/setup/dbutils/unlock_entity.sh similarity index 98% rename from packaging/dbscripts/unlock_entity.sh rename to packaging/setup/dbutils/unlock_entity.sh index 5c95e16..1af604e 100755 --- a/packaging/dbscripts/unlock_entity.sh +++ b/packaging/setup/dbutils/unlock_entity.sh @@ -1,7 +1,6 @@ #!/bin/sh -DBFUNC_COMMON_DBSCRIPTS_DIR="$(dirname "$0")" -. "${DBFUNC_COMMON_DBSCRIPTS_DIR}/dbfunc-custom.sh" +. "$(dirname "$0")/dbfunc-base.sh" cleanup() { dbfunc_cleanup diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index ca17c79..95973b6 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -115,7 +115,7 @@ 'taskcleaner.sh' ) OVIRT_ENGINE_UNLOCK_ENTITY = os.path.join( - OVIRT_ENGINE_DB_DIR, + OVIRT_ENGINE_DB_UTILS_DIR, 'unlock_entity.sh' ) -- To view, visit https://gerrit.ovirt.org/39687 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd42d154765aa15fca15b68ea9a0eae592dcd0a4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
