GitList

Browse code

don't return error if can't delete non-existing container

Signed-off-by: Sally O'Malley <somalley@redhat.com>

Sally O'Malley authored on 2015/12/03 03:48:59
Showing 1 changed files

integration-cli/docker_utils.go index 1915995..d0b54aa 100644

@@ -627,8 +627,10 @@ func deleteAllContainers() error {
 		return err
 	}
 
-	if err = deleteContainer(containers); err != nil {
-		return err
+	if containers != "" {
+		if err = deleteContainer(containers); err != nil {
+			return err
+		}
 	}
 	return nil
 }

...	...	@@ -627,8 +627,10 @@ func deleteAllContainers() error {
627	627	return err
628	628	}
629	629
630		- if err = deleteContainer(containers); err != nil {
631		- return err
	630	+ if containers != "" {
	631	+ if err = deleteContainer(containers); err != nil {
	632	+ return err
	633	+ }
632	634	}
633	635	return nil
634	636	}