commit a3ab6865ff870b81f95a0e77da8881cb8a407a06
author Jenkins <jenkins@review.openstack.org> Sat Jan 09 06:51:04 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jan 09 06:51:04 2016 +0000
tree 027cd5c59efcefae632fb0ceb45d32caa1c8a4fd
parent 698c62c430032d323350a9c85cd181ca61fdb4c3
parent ecc1f41d5053807a70b51bcf2247b51d0ac81ae1

Merge "Don't reinstall package just after installing."

functions-common

diff --git a/functions-common b/functions-common
index cb2998b..361d27c 100644
--- a/functions-common
+++ b/functions-common
@@ -1245,7 +1245,9 @@
 # install_package package [package ...]
 function install_package {
     update_package_repo
-    real_install_package $@ || RETRY_UPDATE=True update_package_repo && real_install_package $@
+    if ! real_install_package "$@"; then
+        RETRY_UPDATE=True update_package_repo && real_install_package "$@"
+    fi
 }
 
 # Distro-agnostic function to tell if a package is installed