From 77dedd9eababa9a2928d7ec7fb50137886459433 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 8 Apr 2014 19:26:09 +0100 Subject: [PATCH] Properly return error when invalid instance state is found --- builder/openstack/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builder/openstack/server.go b/builder/openstack/server.go index d62f5a635..fb48659b1 100644 --- a/builder/openstack/server.go +++ b/builder/openstack/server.go @@ -75,8 +75,7 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) { } if !found { - fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target) - return + return nil, fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target) } log.Printf("Waiting for state to become: %s currently %s (%d%%)", conf.Target, currentState, currentProgress)