diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/remote.exp | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2002-03-31 Hans-Peter Nilsson <hp@bitrange.com> + + * lib/remote.exp (check_for_board_status): Also strip a \r before + a \n before the exit message. + 2002-03-26 Hans-Peter Nilsson <hp@bitrange.com> * lib/libgloss.exp (build_wrapper): Wrap _exit too, unless diff --git a/lib/remote.exp b/lib/remote.exp index 518bf26..bfae4fd 100644 --- a/lib/remote.exp +++ b/lib/remote.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2001, 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1081,7 +1081,7 @@ proc check_for_board_status { variable } { if [regexp "(^|\[\r\n\])\\*\\*\\* EXIT code" $output] { regsub "^.*\\*\\*\\* EXIT code " $output "" result; regsub "\[\r\n\].*$" $result "" result; - regsub -all "(^|\[\r\n\])\\*\\*\\* EXIT code \[^\r\n\]*(\[\r\n\]\[\r\n\]?|$)" $output "" output; + regsub -all "(^|\[\r\n\]|\r\n)\\*\\*\\* EXIT code \[^\r\n\]*(\[\r\n\]\[\r\n\]?|$)" $output "" output; regsub "^\[^0-9\]*" $result "" result regsub "\[^0-9\]*$" $result "" result verbose "got board status $result" 3 |