Alex Lourie has uploaded a new change for review. Change subject: packaging: Updated usage of yum binary during upgrade ......................................................................
packaging: Updated usage of yum binary during upgrade Change-Id: I9fcae46e0ae479a004684e40e7a29ca248a0524d Signed-off-by: Alex Lourie <[email protected]> --- M packaging/fedora/setup/basedefs.py M packaging/fedora/setup/engine-upgrade.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/7568/1 diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index ee206a7..dcc341d 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -114,6 +114,7 @@ EXEC_LSOF="/usr/sbin/lsof" EXEC_ENCRYPT_PASS="%s/encryptpasswd.sh"%(DIR_OVIRT_PKI) EXEC_RPM="/bin/rpm" +EXEC_YUM = "/usr/bin/yum" EXEC_FREE="/usr/bin/free" EXEC_DF = "/bin/df" EXEC_DATE="/bin/date" diff --git a/packaging/fedora/setup/engine-upgrade.py b/packaging/fedora/setup/engine-upgrade.py index 66851e1..fd2b608 100755 --- a/packaging/fedora/setup/engine-upgrade.py +++ b/packaging/fedora/setup/engine-upgrade.py @@ -49,7 +49,6 @@ LOG_PATH = "/var/log/ovirt-engine" LOG_FILE = "ovirt-engine-upgrade.log" -YUM_EXEC = "/usr/bin/yum" ETL_SERVICE="/etc/init.d/ovirt-engine-etl" # Versions @@ -303,7 +302,7 @@ # TODO: Run test transaction logging.debug("Yum update started") cmd = [ - YUM_EXEC, "update", "-q", "-y", + basedefs.EXEC_YUM, "update", "-q", "-y", ] + RPM_LIST.split() output, rc = utils.execCmd(cmdList=cmd, failOnError=True, msg=MSG_ERROR_YUM_UPDATE) logging.debug("Yum update completed successfully") @@ -406,7 +405,7 @@ # Do rollback only if update went well logging.debug("Yum rollback started") cmd = [ - YUM_EXEC, "history", "-y", "undo", upgradeTid, + basedefs.EXEC_YUM, "history", "-y", "undo", upgradeTid, ] output, rc = utils.execCmd(cmdList=cmd, failOnError=True, msg=MSG_ERROR_YUM_HISTORY_UNDO) logging.debug("Yum rollback completed successfully") @@ -421,7 +420,7 @@ # Get the list cmd = [ - YUM_EXEC, "history", "list", basedefs.ENGINE_RPM_NAME, + basedefs.EXEC_YUM, "history", "list", basedefs.ENGINE_RPM_NAME, ] output, rc = utils.execCmd(cmdList=cmd, failOnError=True, msg=MSG_ERROR_YUM_HISTORY_LIST) -- To view, visit http://gerrit.ovirt.org/7568 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fcae46e0ae479a004684e40e7a29ca248a0524d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
