@@ -1163,7 +1163,7 @@ function update_package_repo {
11631163
11641164 if is_ubuntu; then
11651165 local xtrace
1166- xtrace=$( set +o | grep xtrace)
1166+ xtrace=$( set +o | grep xtrace)
11671167 set +o xtrace
11681168 if [[ " $REPOS_UPDATED " != " True" || " $RETRY_UPDATE " = " True" ]]; then
11691169 # if there are transient errors pulling the updates, that's fine.
@@ -1775,11 +1775,17 @@ function run_phase {
17751775# remove extra commas from the input string (i.e. ``ENABLED_SERVICES``)
17761776# _cleanup_service_list service-list
17771777function _cleanup_service_list {
1778+ local xtrace
1779+ xtrace=$( set +o | grep xtrace)
1780+ set +o xtrace
1781+
17781782 echo " $1 " | sed -e '
17791783 s/,,/,/g;
17801784 s/^,//;
17811785 s/,$//
17821786 '
1787+
1788+ $xtrace
17831789}
17841790
17851791# disable_all_services() removes all current services
@@ -1797,6 +1803,10 @@ function disable_all_services {
17971803# Uses global ``ENABLED_SERVICES``
17981804# disable_negated_services
17991805function disable_negated_services {
1806+ local xtrace
1807+ xtrace=$( set +o | grep xtrace)
1808+ set +o xtrace
1809+
18001810 local to_remove=" "
18011811 local remaining=" "
18021812 local service
@@ -1814,6 +1824,8 @@ function disable_negated_services {
18141824 # go through the service list. if this service appears in the "to
18151825 # be removed" list, drop it
18161826 ENABLED_SERVICES=$( remove_disabled_services " $remaining " " $to_remove " )
1827+
1828+ $xtrace
18171829}
18181830
18191831# disable_service() prepares the services passed as argument to be
@@ -1825,6 +1837,10 @@ function disable_negated_services {
18251837# Uses global ``DISABLED_SERVICES``
18261838# disable_service service [service ...]
18271839function disable_service {
1840+ local xtrace
1841+ xtrace=$( set +o | grep xtrace)
1842+ set +o xtrace
1843+
18281844 local disabled_svcs=" ${DISABLED_SERVICES} "
18291845 local enabled_svcs=" ,${ENABLED_SERVICES} ,"
18301846 local service
@@ -1836,6 +1852,8 @@ function disable_service {
18361852 done
18371853 DISABLED_SERVICES=$( _cleanup_service_list " $disabled_svcs " )
18381854 ENABLED_SERVICES=$( _cleanup_service_list " $enabled_svcs " )
1855+
1856+ $xtrace
18391857}
18401858
18411859# enable_service() adds the services passed as argument to the
@@ -1849,6 +1867,10 @@ function disable_service {
18491867# Uses global ``ENABLED_SERVICES``
18501868# enable_service service [service ...]
18511869function enable_service {
1870+ local xtrace
1871+ xtrace=$( set +o | grep xtrace)
1872+ set +o xtrace
1873+
18521874 local tmpsvcs=" ${ENABLED_SERVICES} "
18531875 local service
18541876 for service in $@ ; do
@@ -1862,6 +1884,8 @@ function enable_service {
18621884 done
18631885 ENABLED_SERVICES=$( _cleanup_service_list " $tmpsvcs " )
18641886 disable_negated_services
1887+
1888+ $xtrace
18651889}
18661890
18671891# is_service_enabled() checks if the service(s) specified as arguments are
@@ -1890,6 +1914,7 @@ function is_service_enabled {
18901914 local xtrace
18911915 xtrace=$( set +o | grep xtrace)
18921916 set +o xtrace
1917+
18931918 local enabled=1
18941919 local services=$@
18951920 local service
@@ -1915,13 +1940,18 @@ function is_service_enabled {
19151940 [[ ${service} == " swift" && ${ENABLED_SERVICES} =~ " s-" ]] && enabled=0
19161941 [[ ${service} == s-* && ${ENABLED_SERVICES} =~ " swift" ]] && enabled=0
19171942 done
1943+
19181944 $xtrace
19191945 return $enabled
19201946}
19211947
19221948# remove specified list from the input string
19231949# remove_disabled_services service-list remove-list
19241950function remove_disabled_services {
1951+ local xtrace
1952+ xtrace=$( set +o | grep xtrace)
1953+ set +o xtrace
1954+
19251955 local service_list=$1
19261956 local remove_list=$2
19271957 local service
@@ -1940,6 +1970,9 @@ function remove_disabled_services {
19401970 enabled=" ${enabled} ,$service "
19411971 fi
19421972 done
1973+
1974+ $xtrace
1975+
19431976 _cleanup_service_list " $enabled "
19441977}
19451978
0 commit comments