openstack/devstack
Code Issues Proposed changes

Merge "Add header guard to functions/functions-common"

Browse Source
This commit is contained in:
Jenkins 2015-08-17 19:38:05 +00:00 committed by Gerrit Code Review
commit 4d223251e8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@ -10,6 +10,10 @@
# - ``GLANCE_HOSTPORT`` # - ``GLANCE_HOSTPORT``
# #
# ensure we don't re-source this in the same environment
[[ -z "$_DEVSTACK_FUNCTIONS" ]] || return 0
declare -r _DEVSTACK_FUNCTIONS=1
# Include the common functions # Include the common functions
FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
source ${FUNC_DIR}/functions-common source ${FUNC_DIR}/functions-common

4
functions-common
View File

@ -36,6 +36,10 @@
XTRACE=$(set +o | grep xtrace) XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
# ensure we don't re-source this in the same environment
[[ -z "$_DEVSTACK_FUNCTIONS_COMMON" ]] || return 0
declare -r _DEVSTACK_FUNCTIONS_COMMON=1
# Global Config Variables # Global Config Variables
declare -A GITREPO declare -A GITREPO
declare -A GITBRANCH declare -A GITBRANCH