Merge pull request #9427 from mheon/bump_301

Bump to v3.0.1

1 files changed, 4 insertions, 7 deletions

diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index 518309a03..e79def6f3 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -105,6 +105,7 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) {
 	query := waitQueryLibpod{}
 	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
+		return
 	}
 
 	if _, found := r.URL.Query()["interval"]; found {
@@ -130,10 +131,9 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) {
 		if errors.Cause(err) == define.ErrNoSuchCtr {
 			ContainerNotFound(w, name, err)
 			return
-		} else {
-			InternalServerError(w, err)
-			return
 		}
+		InternalServerError(w, err)
+		return
 	}
 	WriteResponse(w, http.StatusOK, strconv.Itoa(int(exitCode)))
 }
@@ -141,7 +141,6 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) {
 type containerWaitFn func(conditions ...define.ContainerStatus) (int32, error)
 
 func createContainerWaitFn(ctx context.Context, containerName string, interval time.Duration) containerWaitFn {
-
 	runtime := ctx.Value("runtime").(*libpod.Runtime)
 	var containerEngine entities.ContainerEngine = &abi.ContainerEngine{Libpod: runtime}
 
@@ -170,7 +169,6 @@ func isValidDockerCondition(cond string) bool {
 }
 
 func waitDockerCondition(ctx context.Context, containerName string, interval time.Duration, dockerCondition string) (int32, error) {
-
 	containerWait := createContainerWaitFn(ctx, containerName, interval)
 
 	var err error
@@ -200,9 +198,8 @@ func waitRemoved(ctrWait containerWaitFn) (int32, error) {
 	code, err := ctrWait(define.ContainerStateUnknown)
 	if err != nil && errors.Cause(err) == define.ErrNoSuchCtr {
 		return code, nil
-	} else {
-		return code, err
 	}
+	return code, err
 }
 
 func waitNextExit(ctrWait containerWaitFn) (int32, error) {