openstack/devstack
Code Issues Proposed changes

Backport Grenade updates

Browse Source 
Backport changes made in Grenade's copy of functions since the last sync:
* d0654b9,i 4c7726e - get_release_name_from_branch()
* 7907766 - edits to install_package()

Change-Id: I0714c0b1072f1360c3c08fe24225e65e2a550fad
This commit is contained in:
Dean Troyer 2014-02-12 12:09:22 -06:00
parent dff49a242e
commit abc7b1d765
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions-common
View File

@ -460,6 +460,17 @@ function is_ubuntu {
# Git Functions # Git Functions
# ============= # =============
# Returns openstack release name for a given branch name
# ``get_release_name_from_branch branch-name``
function get_release_name_from_branch(){
local branch=$1
if [[ $branch =~ "stable/" ]]; then
echo ${branch#*/}
else
echo "master"
fi
}
# git clone only if directory doesn't exist already. Since ``DEST`` might not # git clone only if directory doesn't exist already. Since ``DEST`` might not
# be owned by the installation user, we create the directory and change the # be owned by the installation user, we create the directory and change the
# ownership to the proper user. # ownership to the proper user.
@ -792,7 +803,9 @@ function get_packages() {
# install_package package [package ...] # install_package package [package ...]
function install_package() { function install_package() {
if is_ubuntu; then if is_ubuntu; then
[[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update # if there are transient errors pulling the updates, that's fine. It may
# be secondary repositories that we don't really care about.
[[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update || /bin/true
NO_UPDATE_REPOS=True NO_UPDATE_REPOS=True
apt_get install "$@" apt_get install "$@"