summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch')
-rw-r--r--dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
deleted file mode 100644
index ff4e970a4fd4..000000000000
--- a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-fix from upstream:
-
-2004-03-05 Daniel Jacobowitz <drow@mvista.com>
-
- * lib/remote.exp (standard_spawn): Fix rsh username support.
-
-diff --git a/lib/remote.exp b/lib/remote.exp
-index b57276e..cdec0d2 100644
---- a/lib/remote.exp
-+++ b/lib/remote.exp
-@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
- set RSH [board_info $dest rsh_prog]
- }
-
-- if ![board_info $dest exists username] {
-- set rsh_useropts ""
-- } else {
-- set rsh_useropts "-l $username"
-- }
--
- if [board_info $dest exists hostname] {
- set remote [board_info $dest hostname]
- } else {
- set remote $dest
- }
-
-- spawn $RSH $rsh_useropts $remote $commandline
-+ if ![board_info $dest exists username] {
-+ spawn $RSH $remote $commandline
-+ } else {
-+ spawn $RSH -l [board_info $dest username] $remote $commandline
-+ }
-+
- set board_info($dest,fileid) $spawn_id
- return $spawn_id
- }
-@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
- }
-
- if {$code == 1} {
-+ if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
-+
- if { $error_sect != "" } {
- set code [catch {uplevel $error_sect} string]
- } else {