From b01eabf8feb590128e5279b3ed191857c264adae Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Sat, 23 Jan 2016 10:59:51 +1100
Subject: [PATCH] 	* lib/remote.exp (standard_file); Add else clause.

Signed-off-by: Ben Elliston <bje@gnu.org>
---
 ChangeLog      |  4 ++++
 lib/remote.exp | 29 +++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b6c937..78ab33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-23  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* lib/remote.exp (standard_file); Add else clause.
+
 2016-01-16  Ben Elliston  <bje@gnu.org>
 
 	* runtest.exp (runtest): Improve comment about --status.
diff --git a/lib/remote.exp b/lib/remote.exp
index bddf2ae..688680b 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -762,21 +762,22 @@ proc standard_file { dest op args } {
 		return
 	    }
 	}
-    }
-    switch $op {
-	exists {
-	    set status [remote_exec $dest "test -f $file"]
-	    return [lindex $status 0]
-	}
-	delete {
-	    set file ""
-	    # Allow multiple files to be deleted at once.
-	    foreach x $args {
-		append file " $x"
+    } else {
+	switch $op {
+	    exists {
+		set status [remote_exec $dest "test -f $file"]
+		return [lindex $status 0]
+	    }
+	    delete {
+		set file ""
+		# Allow multiple files to be deleted at once.
+		foreach x $args {
+		    append file " $x"
+		}
+		verbose "remote_file deleting $file"
+		set status [remote_exec $dest "rm -f $file"]
+		return [lindex $status 0]
 	    }
-	    verbose "remote_file deleting $file"
-	    set status [remote_exec $dest "rm -f $file"]
-	    return [lindex $status 0]
 	}
     }
 }
-- 
2.7.4