Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 954ba400 authored by gsell's avatar gsell
Browse files

Merge branch '125-rename-variable-defaultusedreleasestages-to-defaultreleasestages' into 'master'

Resolve "rename variable DefaultUsedReleaseStages to DefaultReleaseStages"

Closes #125

See merge request !94
parents d453e173 b40297d1
No related branches found
No related tags found
1 merge request!94Resolve "rename variable DefaultUsedReleaseStages to DefaultReleaseStages"
...@@ -5,4 +5,4 @@ DefaultGroups='Tools Programming' ...@@ -5,4 +5,4 @@ DefaultGroups='Tools Programming'
ReleaseStages=':unstable:stable:deprecated:' ReleaseStages=':unstable:stable:deprecated:'
# set releases which should be available after initialization # set releases which should be available after initialization
DefaultUsedReleaseStages='stable' DefaultReleaseStages='stable'
...@@ -114,7 +114,7 @@ save_env() { ...@@ -114,7 +114,7 @@ save_env() {
[[ $1 == 'no' ]] && return 0 [[ $1 == 'no' ]] && return 0
local vars=( Version GroupDepths UsedReleases UseFlags UsedGroups ) local vars=( Version GroupDepths UsedReleases UseFlags UsedGroups )
vars+=( DefaultGroups ReleaseStages ) vars+=( DefaultGroups ReleaseStages )
vars+=( DefaultUsedReleaseStages ) vars+=( DefaultReleaseStages )
local s=$(typeset -p ${vars[@]}) local s=$(typeset -p ${vars[@]})
declare -g PMODULES_ENV=$( "${base64}" --wrap=0 <<< "$s" ) declare -g PMODULES_ENV=$( "${base64}" --wrap=0 <<< "$s" )
...@@ -1381,7 +1381,7 @@ reset_used_groups() { ...@@ -1381,7 +1381,7 @@ reset_used_groups() {
reset_used_releases() { reset_used_releases() {
declare -g UsedReleases='' declare -g UsedReleases=''
for r in ${DefaultUsedReleaseStages//:/ }; do for r in ${DefaultReleaseStages//:/ }; do
std::append_path UsedReleases "${r}" std::append_path UsedReleases "${r}"
done done
g_env_must_be_saved='yes' g_env_must_be_saved='yes'
...@@ -2288,7 +2288,7 @@ if [[ -n ${PMODULES_ENV} ]]; then ...@@ -2288,7 +2288,7 @@ if [[ -n ${PMODULES_ENV} ]]; then
declare -g Version="${PMODULES_VERSION}" declare -g Version="${PMODULES_VERSION}"
g_env_must_be_saved='yes' g_env_must_be_saved='yes'
fi fi
if [[ -v DefaultGroups ]] || [[ -v DefaultUsedReleaseStages ]] || [[ -v ReleaseStages ]]; then if [[ -v DefaultGroups ]] || [[ -v DefaultReleaseStages ]] || [[ -v ReleaseStages ]]; then
source "${pmodules_config_file}" || \ source "${pmodules_config_file}" || \
std::die 3 "Oops: cannot parse config file -- %s\n" \ std::die 3 "Oops: cannot parse config file -- %s\n" \
"${pmodules_config_file}" "${pmodules_config_file}"
......
#!/bin/tcsh #!/bin/tcsh
setenv DefaultGroups 'Tools Programming' setenv DefaultGroups 'Tools Programming'
setenv DefaultUsedReleaseStages 'stable' setenv DefaultReleaseStages 'stable'
if ( ! $?PMODULES_VERSION ) then if ( ! $?PMODULES_VERSION ) then
setenv PMODULES_VERSION "@PMODULES_VERSION@" setenv PMODULES_VERSION "@PMODULES_VERSION@"
endif endif
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
# #
declare -xa DefaultGroups declare -xa DefaultGroups
declare -xa DefaultUsedReleaseStages declare -xa DefaultReleaseStages
declare -x PMODULES_VERSION declare -x PMODULES_VERSION
: ${DefaultGroups:=(Tools Programming)} : ${DefaultGroups:=(Tools Programming)}
: ${DefaultUsedReleaseStages:=(stable)} : ${DefaultReleaseStages:=(stable)}
: ${PMODULES_VERSION:=@PMODULES_VERSION@} : ${PMODULES_VERSION:=@PMODULES_VERSION@}
############################################################################# #############################################################################
......
...@@ -78,14 +78,14 @@ done ...@@ -78,14 +78,14 @@ done
# build initial list of used releases # build initial list of used releases
declare -x UsedReleases='' declare -x UsedReleases=''
typeset -T UsedReleases usedreleases typeset -T UsedReleases usedreleases
for r in ${DefaultUsedReleaseStages[@]}; do for r in ${DefaultReleaseStages[@]}; do
usedreleases=( "${r}" ${(m)usedreleases:#${r}} ) usedreleases=( "${r}" ${(m)usedreleases:#${r}} )
done done
eval $(save_env UsedReleases DefaultUsedReleaseStages DefaultGroups ReleaseStages) eval $(save_env UsedReleases DefaultReleaseStages DefaultGroups ReleaseStages)
unset UsedReleases unset UsedReleases
unset DefaultUsedReleaseStages unset DefaultReleaseStages
unset DefaultGroups unset DefaultGroups
unset ReleaseStages unset ReleaseStages
......
...@@ -14,5 +14,5 @@ declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}" ...@@ -14,5 +14,5 @@ declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
declare -x DefaultGroups='Tools Programming' declare -x DefaultGroups='Tools Programming'
declare ReleaseStages=':unstable:stable:deprecated:' declare ReleaseStages=':unstable:stable:deprecated:'
declare DefaultUsedReleaseStages='stable' declare DefaultReleaseStages='stable'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment