Blame SOURCES/ifs-issue.patch

e965a0
diff -u b/src/journal.sh b/src/journal.sh
e965a0
--- b/src/journal.sh
e965a0
+++ b/src/journal.sh
e965a0
@@ -431,12 +431,10 @@
e965a0
     [[ -t 1 ]] && textfile="$__INTERNAL_BEAKERLIB_JOURNAL_COLORED" || textfile="$__INTERNAL_BEAKERLIB_JOURNAL_TXT"
e965a0
     cat "$textfile"
e965a0
 
e965a0
-    local tmp="$__INTERNAL_LogText_no_file"
e965a0
-    __INTERNAL_LogText_no_file=1
e965a0
+    local __INTERNAL_LogText_no_file=1
e965a0
     __INTERNAL_PrintHeadLog "${TEST}" 2>&1
e965a0
     __INTERNAL_LogText "Phases: $__INTERNAL_PHASES_PASSED good, $__INTERNAL_PHASES_FAILED bad" LOG 2>&1
e965a0
     __INTERNAL_LogText "RESULT: $TEST" $__INTERNAL_PHASES_WORST_RESULT 2>&1
e965a0
-    __INTERNAL_LogText_no_file=$tmp
e965a0
 
e965a0
     return 0
e965a0
 }
e965a0
@@ -645,6 +643,7 @@
e965a0
 # $2 result
e965a0
 # $3 command
e965a0
 rljAddTest(){
e965a0
+    local IFS
e965a0
     __INTERNAL_PersistentDataLoad
e965a0
     if [ $__INTERNAL_PHASE_OPEN -eq 0 ]; then
e965a0
         rlPhaseStart "FAIL" "Asserts collected outside of a phase"
e965a0
@@ -723,6 +722,7 @@
e965a0
 
e965a0
 # Creates header
e965a0
 __INTERNAL_CreateHeader(){
e965a0
+    local IFS
e965a0
 
e965a0
     __INTERNAL_PrintHeadLog "TEST PROTOCOL" 2> /dev/null
e965a0
 
e965a0
@@ -816,7 +816,7 @@
e965a0
         local count=0
e965a0
         local type="unknown"
e965a0
         local cpu_regex="^model\sname.*: (.*)$"
e965a0
-        while read line; do
e965a0
+        while read -r line; do
e965a0
             if [[ "$line" =~ $cpu_regex ]]; then
e965a0
                 type="${BASH_REMATCH[1]}"
e965a0
                 let count++
e965a0
@@ -830,7 +830,7 @@
e965a0
      if [[ -f "/proc/meminfo" ]]; then
e965a0
         size=0
e965a0
         local ram_regex="^MemTotal: *(.*) kB$"
e965a0
-        while read line; do
e965a0
+        while read -r line; do
e965a0
             if [[ "$line" =~ $ram_regex ]]; then
e965a0
                 size=`expr ${BASH_REMATCH[1]} / 1024`
e965a0
                 break
e965a0
diff -u b/src/logging.sh b/src/logging.sh
e965a0
--- b/src/logging.sh
e965a0
+++ b/src/logging.sh
e965a0
@@ -53,10 +53,8 @@
e965a0
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
e965a0
 
e965a0
 __INTERNAL_PrintText() {
e965a0
-  local tmp="$__INTERNAL_LogText_no_file"
e965a0
-  __INTERNAL_LogText_no_file=1
e965a0
+  local __INTERNAL_LogText_no_file=1
e965a0
   __INTERNAL_LogText "$@"
e965a0
-  __INTERNAL_LogText_no_file=$tmp
e965a0
 }
e965a0
 
e965a0
 __INTERNAL_LogText() {
e965a0
@@ -531,6 +529,7 @@
e965a0
 rlShowPackageVersion()
e965a0
 {
e965a0
     local score=0
e965a0
+    local IFS
e965a0
     if [ $# -eq 0 ]; then
e965a0
         rlLogWarning "rlShowPackageVersion: Too few options"
e965a0
         return 1
e965a0
only in patch2:
e965a0
unchanged:
e965a0
--- a/src/analyze.sh
e965a0
+++ b/src/analyze.sh
e965a0
@@ -76,6 +76,7 @@ Return 0 if... TODO
e965a0
 =cut
e965a0
 
e965a0
 rlDejaSum(){
e965a0
+    local IFS
e965a0
     rlLog "Summarizing files: $1 $2"
e965a0
     rlLogDebug "Calling beakerlib-deja-summarize routine"
e965a0
     beakerlib-deja-summarize $1 $2 | while read line
e965a0
only in patch2:
e965a0
unchanged:
e965a0
--- a/src/libraries.sh
e965a0
+++ b/src/libraries.sh
e965a0
@@ -268,9 +268,10 @@ __INTERNAL_envdebugget() {
e965a0
 __INTERNAL_envdebugdiff() {
e965a0
   rlLogDebug "rlImport: library $1 changes following environment; changed functions are marked with asterisk (*)"
e965a0
   diff -U0 <(echo "$__INTERNAL_envdebugvariables") <(__INTERNAL_envdebugget 1) | tail -n +3 | grep -E -v '^@@'
e965a0
-  local line fn print='' print2 LF="
e965a0
-"
e965a0
-  while IFS= read line; do
e965a0
+  local line fn print='' print2 LF=$'\n'
e965a0
+  local IFS
e965a0
+
e965a0
+  while read -r line; do
e965a0
     [[ "$line" =~ ^(.)([^[:space:]]+)[[:space:]]\(\) ]] && {
e965a0
       [[ -n "$print" ]] && {
e965a0
         echo "$fn"
e965a0
only in patch2:
e965a0
unchanged:
e965a0
--- a/src/rpms.sh
e965a0
+++ b/src/rpms.sh
e965a0
@@ -56,6 +56,7 @@ __INTERNAL_RpmPresent() {
e965a0
     local version=$3
e965a0
     local release=$4
e965a0
     local arch=$5
e965a0
+    local IFS
e965a0
 
e965a0
     local package=$name-$version-$release.$arch
e965a0
     [ "$arch"    == "" ] && package=$name-$version-$release
e965a0
only in patch2:
e965a0
unchanged:
e965a0
--- a/src/testing.sh
e965a0
+++ b/src/testing.sh
e965a0
@@ -749,6 +749,7 @@ rlRun() {
e965a0
     local __INTERNAL_rlRun_TAG_OUT=''
e965a0
     local __INTERNAL_rlRun_TAG_ERR=''
e965a0
     local __INTERNAL_rlRun_LOG_FILE=''
e965a0
+    local IFS
e965a0
 
e965a0
     while true ; do
e965a0
         case "$1" in