Make declared variables global

Code Issues Proposed changes

When variables use the 'declare' directive, it is by default a local
variable. While other variables have global scope.
For example:
 declare -A AN_ARRAY # local in scope
 foo=1 # global in scope
This causes errors to occur as some of the variables will be local only
and others will be global.
Update the code, as appropriate, so that variables using the 'declare'
directive also include the '-g' flag to have them also be global. Not
every instance of a declared variable has been updated.
Closes-Bug: #1669509
Co-Authored-By: John L. Villalovos <john.l.villalovos@intel.com>
Change-Id: I2180b68fe861ad19c6d4ec0df0f9f8a528347862

This commit is contained in:

Sean Dague

2017年03月06日 14:07:23 -05:00

committed by John L. Villalovos

parent 6f23555c95

commit afef8bf097

6 changed files with 15 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

18
functions-common

View File

@@ -37,12 +37,12 @@ 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

declare -r -g _DEVSTACK_FUNCTIONS_COMMON=1

# Global Config Variables

declare -A GITREPO

declare -A GITBRANCH

declare -A GITDIR

declare -A -g GITREPO

declare -A -g GITBRANCH

declare -A -g GITDIR

TRACK_DEPENDS=${TRACK_DEPENDS:-False}

@@ -306,7 +306,7 @@ function warn {

# ``os_PACKAGE`` - package type: ``deb`` or ``rpm``

# ``os_CODENAME`` - vendor's codename for release: ``xenial``

declare os_VENDOR os_RELEASE os_PACKAGE os_CODENAME

declare -g os_VENDOR os_RELEASE os_PACKAGE os_CODENAME

# Make a *best effort* attempt to install lsb_release packages for the

# user if not available. Note can't use generic install_package*

@@ -361,7 +361,7 @@ function GetOSVersion {

# Translate the OS version values into common nomenclature

# Sets global ``DISTRO`` from the ``os_*`` values

declare DISTRO

declare -g DISTRO

function GetDistro {

GetOSVersion

@@ -2376,9 +2376,9 @@ function sudo_with_proxies {

# Resolution is only in whole seconds, so should be used for long

# running activities.

declare -A _TIME_TOTAL

declare -A _TIME_START

declare -r _TIME_BEGIN=$(date +%s)

declare -A -g _TIME_TOTAL

declare -A -g _TIME_START

declare -r -g _TIME_BEGIN=$(date +%s)

# time_start $name

#

Make declared variables global

18 functions-common Unescape Escape View File

18
functions-common

View File