From 78185e215bda86494b449587cf9cf181765f77b0 Mon Sep 17 00:00:00 2001 From: Alessio Ababilov Date: Tue, 25 Jun 2013 13:50:32 +0300 Subject: [PATCH] bootstrap: install requirements before removing conflicts Change-Id: I239601417f9b7b5fb50bad05a0ee2ee279e6596b --- smithy | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/smithy b/smithy index 8a8c085e..7dce73db 100755 --- a/smithy +++ b/smithy @@ -116,6 +116,19 @@ bootstrap_epel() bootstrap_rpm_packages() { + # NOTE(aababilov): the latter operations require some packages, + # so, begin from installation + if [ -n "$REQUIRES" ]; then + echo "Installing packages: $(echo $REQUIRES)" + for rpm in $REQUIRES; do + yum_install "$rpm" + if [ "$?" != "0" ]; then + echo "Failed installing $rpm" + return 1 + fi + done + fi + CONFLICTS=$(python -c "import yaml packages = set() try: @@ -132,16 +145,6 @@ for pkg in packages: echo "Removing conflicting packages: $(echo $CONFLICTS)" yum erase $YUM_OPTS $CONFLICTS fi - if [ -n "$REQUIRES" ]; then - echo "Installing packages: $(echo $REQUIRES)" - for rpm in $REQUIRES; do - yum_install "$rpm" - if [ "$?" != "0" ]; then - echo "Failed installing $rpm" - return 1 - fi - done - fi } bootstrap_python_rpms()