Alex Lourie has uploaded a new change for review.
Change subject: packaging: replaced hard-coded service name with a const
......................................................................
packaging: replaced hard-coded service name with a const
Change-Id: Ide45b6f39132b2cab9859828ff94e8788ee80189
Signed-off-by: Alex Lourie <alou...@redhat.com>
---
M packaging/fedora/setup/engine-upgrade.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/9760/1
diff --git a/packaging/fedora/setup/engine-upgrade.py
b/packaging/fedora/setup/engine-upgrade.py
index f9467a9..cdc5c22 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -127,7 +127,7 @@
MSG_INFO_DONE = "DONE"
MSG_INFO_ERROR = "ERROR"
MSG_INFO_REASON = " **Reason: %s**\n"
-MSG_INFO_STOP_ENGINE = "Stopping ovirt-engine service"
+MSG_INFO_STOP_ENGINE = "Stopping %s service"
MSG_INFO_STOP_DB = "Stopping DB related services"
MSG_INFO_START_DB = "Starting DB related services"
MSG_INFO_PREUPGRADE = "Pre-upgrade validations"
@@ -140,7 +140,7 @@
MSG_ERROR_UPGRADE = "\n **Error: Upgrade failed, rolling back**"
MSG_INFO_DB_RESTORE = "Restoring Database"
MSG_INFO_YUM_ROLLBACK = "Rolling back rpms..."
-MSG_INFO_START_ENGINE = "Starting ovirt-engine"
+MSG_INFO_START_ENGINE = "Starting %s service"
MSG_INFO_DB_BACKUP_FILE = "DB Backup available at "
MSG_INFO_LOG_FILE = "Upgrade log available at"
MSG_INFO_CHECK_UPDATE = "\nChecking for updates... (This may take several
minutes)"
@@ -1016,7 +1016,7 @@
# We ask the user before stoping ovirt-engine or take command line
option
if options.unattended_upgrade or checkEngine(engineService):
# Stopping engine
- runFunc(stopEngineService, MSG_INFO_STOP_ENGINE)
+ runFunc(stopEngineService, MSG_INFO_STOP_ENGINE %
engineService)
if updateRelatedToDB:
runFunc([[stopDbRelatedServices, etlService,
notificationService]], MSG_INFO_STOP_DB)
@@ -1027,7 +1027,7 @@
# If something went wrong, restart DB services and the
engine
except:
runFunc([[startDbRelatedServices, etlService,
notificationService]], MSG_INFO_START_DB)
- runFunc(startEngineService, MSG_INFO_START_ENGINE)
+ runFunc(startEngineService, MSG_INFO_START_ENGINE %
engineService)
raise
else:
# This means that user chose not to stop ovirt-engine
@@ -1090,7 +1090,7 @@
finally:
# start engine
- runFunc([startEngine], MSG_INFO_START_ENGINE)
+ runFunc([startEngine], MSG_INFO_START_ENGINE % engineService)
# Print log location on success
addAdditionalMessages(etlService.isServiceAvailable())
--
To view, visit http://gerrit.ovirt.org/9760
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide45b6f39132b2cab9859828ff94e8788ee80189
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
