commit 08819d78a81d13a7c0d5895467b2f2d51ba0b2e4
author Jenkins <jenkins@review.openstack.org> Sun Sep 09 19:34:01 2012 +0000
committer Gerrit Code Review <review@openstack.org> Sun Sep 09 19:34:01 2012 +0000
tree 77044b101c40010b4f3d8b637b2180aa7b81c311
parent 6e77163b9d0bc2703a98f20a6964187511b1b9e3
parent c0482e6efcc34515b9383e6a0de1e03b75d6ce62

Merge "Add contitional update package repositories to install_package()"

functions

diff --git a/functions b/functions
index c109eae..8ed9960 100644
--- a/functions
+++ b/functions
@@ -536,7 +536,11 @@
     if [[ -z "$os_PACKAGE" ]]; then
         GetOSVersion
     fi
+
     if [[ "$os_PACKAGE" = "deb" ]]; then
+        [[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update
+        NO_UPDATE_REPOS=True
+
         apt_get install "$@"
     else
         yum_install "$@"

stack.sh

diff --git a/stack.sh b/stack.sh
index fc92c4f..5849a41 100755
--- a/stack.sh
+++ b/stack.sh
@@ -183,7 +183,7 @@
 
     # Give the non-root user the ability to run as **root** via ``sudo``
     if [[ "$os_PACKAGE" = "deb" ]]; then
-        dpkg -l sudo || apt_get update && install_package sudo
+        dpkg -l sudo || install_package sudo
     else
         rpm -qa | grep sudo || install_package sudo
     fi
@@ -660,7 +660,6 @@
 
 # Install package requirements
 if [[ "$os_PACKAGE" = "deb" ]]; then
-    apt_get update
     install_package $(get_packages $FILES/apts)
 else
     install_package $(get_packages $FILES/rpms)