diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-12 11:30:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 11:30:00 -0500 |
| commit | 291f59600b7857bbec6f340d3ceec6e2e9ce923f (patch) | |
| tree | 401aaa4e56cbe585582fa1124a9cd77a83ae21a9 /pkg/util/utils.go | |
| parent | 1b284a298c0bde20561321f325d4a7ad00e7bd25 (diff) | |
| parent | 78c8a87362ee27ba1d2a62b7c9d73adc313c7d7e (diff) | |
| download | podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.gz podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.bz2 podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.zip | |
Merge pull request #9331 from Luap99/lint
Enable more golangci-lint linters
Diffstat (limited to 'pkg/util/utils.go')
| -rw-r--r-- | pkg/util/utils.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index e0f631eb4..32bb66332 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -388,7 +388,6 @@ func GetKeepIDMapping() (*storage.IDMappingOptions, int, int, error) { options.HostUIDMapping = false options.HostGIDMapping = false - } // Simply ignore the setting and do not setup an inner namespace for root as it is a no-op return &options, uid, gid, nil @@ -530,9 +529,9 @@ func ParseInputTime(inputTime string) (time.Time, error) { } } - unix_timestamp, err := strconv.ParseInt(inputTime, 10, 64) + unixTimestamp, err := strconv.ParseInt(inputTime, 10, 64) if err == nil { - return time.Unix(unix_timestamp, 0), nil + return time.Unix(unixTimestamp, 0), nil } // input might be a duration |