summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-02-07 16:30:53 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-09 15:01:34 +0000
commit75914199f331a10eb7ed44de68c738515bdd5b2d (patch)
treee5835e3f4774f8a8d9a14759bdf9984baee7b85f /libpod
parentc8e296c83e20aeafee920540599c84aead4a4c5d (diff)
downloadpodman-75914199f331a10eb7ed44de68c738515bdd5b2d.tar.gz
podman-75914199f331a10eb7ed44de68c738515bdd5b2d.tar.bz2
podman-75914199f331a10eb7ed44de68c738515bdd5b2d.zip
Fix further style issues
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #268 Approved by: rhatdan
Diffstat (limited to 'libpod')
-rw-r--r--libpod/sql_state.go6
-rw-r--r--libpod/sql_state_internal.go3
2 files changed, 3 insertions, 6 deletions
diff --git a/libpod/sql_state.go b/libpod/sql_state.go
index ff04d6d63..f67969cf7 100644
--- a/libpod/sql_state.go
+++ b/libpod/sql_state.go
@@ -920,13 +920,11 @@ func (s *SQLState) RemovePodContainers(pod *Pod) (err error) {
// Remove state first, as it needs the subquery on containers
// Don't bother checking if we actually removed anything, we just want to
// empty the pod
- _, err = tx.Exec(removeCtrState, pod.ID())
- if err != nil {
+ if _, err := tx.Exec(removeCtrState, pod.ID()); err != nil {
return errors.Wrapf(err, "error removing pod %s containers from state table", pod.ID())
}
- _, err = tx.Exec(removeCtr, pod.ID())
- if err != nil {
+ if _, err := tx.Exec(removeCtr, pod.ID()); err != nil {
return errors.Wrapf(err, "error removing pod %s containers from containers table", pod.ID())
}
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go
index 5bc2d84f5..5e18b7cfd 100644
--- a/libpod/sql_state_internal.go
+++ b/libpod/sql_state_internal.go
@@ -672,8 +672,7 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) {
// Retrieve the ports from disk
// They may not exist - if they don't, this container just doesn't have ports
portPath := getPortsPath(s.specsDir, id)
- _, err = os.Stat(portPath)
- if err != nil {
+ if _, err = os.Stat(portPath); err != nil {
if !os.IsNotExist(err) {
return nil, errors.Wrapf(err, "error stating container %s JSON ports", id)
}