Browse code

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

Jenkins authored on 2012/09/10 04:34:01
Showing 2 changed files
... ...
@@ -536,7 +536,11 @@ function install_package() {
536 536
     if [[ -z "$os_PACKAGE" ]]; then
537 537
         GetOSVersion
538 538
     fi
539
+
539 540
     if [[ "$os_PACKAGE" = "deb" ]]; then
541
+        [[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update
542
+        NO_UPDATE_REPOS=True
543
+
540 544
         apt_get install "$@"
541 545
     else
542 546
         yum_install "$@"
... ...
@@ -183,7 +183,7 @@ if [[ $EUID -eq 0 ]]; then
183 183
 
184 184
     # Give the non-root user the ability to run as **root** via ``sudo``
185 185
     if [[ "$os_PACKAGE" = "deb" ]]; then
186
-        dpkg -l sudo || apt_get update && install_package sudo
186
+        dpkg -l sudo || install_package sudo
187 187
     else
188 188
         rpm -qa | grep sudo || install_package sudo
189 189
     fi
... ...
@@ -660,7 +660,6 @@ set -o xtrace
660 660
 
661 661
 # Install package requirements
662 662
 if [[ "$os_PACKAGE" = "deb" ]]; then
663
-    apt_get update
664 663
     install_package $(get_packages $FILES/apts)
665 664
 else
666 665
     install_package $(get_packages $FILES/rpms)