From 77b9b4340d4d49ccc11753900854b3577c7afed2 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Sat, 24 Sep 2016 01:43:58 +0200
Subject: return true when reconcile is called for already active server


diff --git a/src/rhctl/switch_control.go b/src/rhctl/switch_control.go
index 043d682..9fd55ea 100644
--- a/src/rhctl/switch_control.go
+++ b/src/rhctl/switch_control.go
@@ -268,12 +268,16 @@ func (ctrl *SwitchControl) reconcile(requestedServer string) (result bool) {
 	}
 	ctrl.state.ActiveServer = swsrv
 
-	if requestedServer != "" && ctrl.state.ActiveServer != requestedServer {
-		if ctrl.checkAndSelectServer(requestedServer) {
-			rhl.Printf("SwitchCTRL: switching to requested server '%s' ...", requestedServer)
-			result = true
+	if requestedServer != "" {
+		if ctrl.state.ActiveServer != requestedServer {
+			if ctrl.checkAndSelectServer(requestedServer) {
+				rhl.Printf("SwitchCTRL: switching to requested server '%s' ...", requestedServer)
+				result = true
+			} else {
+				rhl.Printf("SwitchCTRL: requested server '%s' is not selectable, ignoring request", requestedServer)
+			}
 		} else {
-			rhl.Printf("SwitchCTRL: requested server '%s' is not selectable, ignoring request", requestedServer)
+			result = true
 		}
 	} else {
 		if s.Channel != swch {
-- 
cgit v0.10.2