| 1 |
Author: zmedico |
| 2 |
Date: 2009-05-01 21:43:50 +0000 (Fri, 01 May 2009) |
| 3 |
New Revision: 13583 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/isolated-functions.sh |
| 7 |
Log: |
| 8 |
Make elog functions use read -r when splitting lines, so that backslashes |
| 9 |
intended for display will not be eaten. (trunk r13582) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/isolated-functions.sh |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/isolated-functions.sh 2009-05-01 21:43:32 UTC (rev 13582) |
| 14 |
+++ main/branches/2.1.6/bin/isolated-functions.sh 2009-05-01 21:43:50 UTC (rev 13583) |
| 15 |
@@ -182,7 +182,7 @@ |
| 16 |
return 1 |
| 17 |
;; |
| 18 |
esac |
| 19 |
- echo -e "$@" | while read ; do |
| 20 |
+ echo -e "$@" | while read -r ; do |
| 21 |
echo "$messagetype $REPLY" >> \ |
| 22 |
"${T}/logging/${EBUILD_PHASE:-other}" |
| 23 |
done |
| 24 |
@@ -192,8 +192,8 @@ |
| 25 |
eqawarn() { |
| 26 |
elog_base QA "$*" |
| 27 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
| 28 |
- echo -e "$@" | while read ; do |
| 29 |
- vecho -e " $WARN*$NORMAL $REPLY" >&2 |
| 30 |
+ echo -e "$@" | while read -r ; do |
| 31 |
+ vecho " $WARN*$NORMAL $REPLY" >&2 |
| 32 |
done |
| 33 |
LAST_E_CMD="eqawarn" |
| 34 |
return 0 |
| 35 |
@@ -202,8 +202,8 @@ |
| 36 |
elog() { |
| 37 |
elog_base LOG "$*" |
| 38 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
| 39 |
- echo -e "$@" | while read ; do |
| 40 |
- echo -e " $GOOD*$NORMAL $REPLY" |
| 41 |
+ echo -e "$@" | while read -r ; do |
| 42 |
+ echo " $GOOD*$NORMAL $REPLY" |
| 43 |
done |
| 44 |
LAST_E_CMD="elog" |
| 45 |
return 0 |
| 46 |
@@ -230,8 +230,8 @@ |
| 47 |
einfo() { |
| 48 |
elog_base INFO "$*" |
| 49 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
| 50 |
- echo -e "$@" | while read ; do |
| 51 |
- echo -e " $GOOD*$NORMAL $REPLY" |
| 52 |
+ echo -e "$@" | while read -r ; do |
| 53 |
+ echo " $GOOD*$NORMAL $REPLY" |
| 54 |
done |
| 55 |
LAST_E_CMD="einfo" |
| 56 |
return 0 |
| 57 |
@@ -248,8 +248,8 @@ |
| 58 |
ewarn() { |
| 59 |
elog_base WARN "$*" |
| 60 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
| 61 |
- echo -e "$@" | while read ; do |
| 62 |
- echo -e " $WARN*$NORMAL $RC_INDENTATION$REPLY" >&2 |
| 63 |
+ echo -e "$@" | while read -r ; do |
| 64 |
+ echo " $WARN*$NORMAL $RC_INDENTATION$REPLY" >&2 |
| 65 |
done |
| 66 |
LAST_E_CMD="ewarn" |
| 67 |
return 0 |
| 68 |
@@ -258,8 +258,8 @@ |
| 69 |
eerror() { |
| 70 |
elog_base ERROR "$*" |
| 71 |
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo |
| 72 |
- echo -e "$@" | while read ; do |
| 73 |
- echo -e " $BAD*$NORMAL $RC_INDENTATION$REPLY" >&2 |
| 74 |
+ echo -e "$@" | while read -r ; do |
| 75 |
+ echo " $BAD*$NORMAL $RC_INDENTATION$REPLY" >&2 |
| 76 |
done |
| 77 |
LAST_E_CMD="eerror" |
| 78 |
return 0 |
Archives