opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-15 10:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4369 from baude/golandautocodecorrections

Browse Source 
goland autocorrections
This commit is contained in:
OpenShift Merge Robot
2019-10-30 14:29:46 +01:00
committed by GitHub
parent 4762b63070 91baaee9a8
commit 7318b0e8c7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/import.go
View File

@ -6,7 +6,7 @@ import (
"github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/cmd/podman/shared/parse"
"github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/adapter"
multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

2
pkg/adapter/containers_remote.go
View File

@ -1021,7 +1021,7 @@ func (r *LocalRuntime) Commit(ctx context.Context, c *cliconfig.CommitValues, co
func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecValues) (int, error) { func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecValues) (int, error) {
var ( var (
oldTermState *term.State oldTermState *term.State
ec int = define.ExecErrorCodeGeneric ec = define.ExecErrorCodeGeneric
) )
// default invalid command exit code // default invalid command exit code
// Validate given environment variables // Validate given environment variables

4
pkg/network/subnet.go
View File

@ -18,7 +18,7 @@ func incByte(subnet *net.IPNet, idx int, shift uint) error {
subnet.IP[idx] = 0 subnet.IP[idx] = 0
return incByte(subnet, idx-1, 0) return incByte(subnet, idx-1, 0)
} }
subnet.IP[idx] += (1 << shift) subnet.IP[idx] += 1 << shift
return nil return nil
} }
@ -58,7 +58,7 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) { //nolint:interfacer
} }
hostStart := ones / 8 hostStart := ones / 8
// Handle the first host byte // Handle the first host byte
cidr.IP[hostStart] |= (0xff & cidr.Mask[hostStart]) cidr.IP[hostStart] |= 0xff & cidr.Mask[hostStart]
// Fill the rest with ones // Fill the rest with ones
for i := hostStart; i < len(cidr.IP); i++ { for i := hostStart; i < len(cidr.IP); i++ {
cidr.IP[i] = 0xff cidr.IP[i] = 0xff

2
test/e2e/create_test.go
View File

@ -239,7 +239,7 @@ var _ = Describe("Podman create", func() {
session = podmanTest.PodmanNoCache([]string{"create", "--pull", "always", "--name=foo", "nginx"}) session = podmanTest.PodmanNoCache([]string{"create", "--pull", "always", "--name=foo", "nginx"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To((Equal(0))) Expect(session.ExitCode()).To(Equal(0))
}) })
It("podman create using image list by tag", func() { It("podman create using image list by tag", func() {