Merge pull request #132 from StrongMonkey/fix-2

small fix
rancher · Jan 19, 2017 · e6ff976 · e6ff976
2 parents 2c1bfd1 + 46999e4
commit e6ff976
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/core/storage/storage.go b/core/storage/storage.go
@@ -109,7 +109,7 @@ func DoVolumeRemove(volume model.Volume, storagePool model.StoragePool, progress
 		}
 		errorList := []error{}
 		for i := 0; i < 3; i++ {
-			if err := utils.RemoveContainer(dockerClient, container.ID); !engineCli.IsErrContainerNotFound(err) {
+			if err := utils.RemoveContainer(dockerClient, container.ID); err != nil && !engineCli.IsErrContainerNotFound(err) {
 				errorList = append(errorList, err)
 			} else {
 				break
@@ -145,7 +145,6 @@ func DoVolumeRemove(volume model.Volume, storagePool model.StoragePool, progress
 				return errors.Wrap(err, constants.DoVolumeRemoveError+"failed to remove directory")
 			}
 		}
-		return errors.Wrap(existErr, constants.DoVolumeRemoveError+"failed to find the path")
 	}
 	return nil
 }