From c93614d541907d88caac3d7b8dcd560acb2fd794 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Sep 2013 23:26:21 +0100 Subject: [PATCH] 1.5.9 is the current develop version --- ChangeLog | 3 +++ bootstrap-salt.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 685be98..80ff1c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 1.5.9: + + Version 1.5.8: * Fixed an Ubuntu regression. `add-apt-repository` is only available on `software-properties-common` after 12.10, inclusive. Thanks Diego Woitasen(diegows) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 284d145..0ef1025 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #=============================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="1.5.8" +__ScriptVersion="1.5.9" __ScriptName="bootstrap-salt.sh" #=============================================================================== @@ -1251,7 +1251,7 @@ __enable_universe_repository() { install_ubuntu_deps() { apt-get update if [ $DISTRO_MAJOR_VERSION -gt 12 ] || [ $DISTRO_MAJOR_VERSION -eq 12 && $DISTRO_MINOR_VERSION -eq 10 ]; then - # Above Ubuntu 11.10 add-apt-repository is in a different package + # Above Ubuntu 12.04 add-apt-repository is in a different package __apt_get_install_noinput software-properties-common || return 1 else __apt_get_install_noinput python-software-properties || return 1