diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-14 18:58:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 18:58:53 +0000 |
| commit | e084f0ee1e1ded564110e84eefca9f18b5669adf (patch) | |
| tree | 61903e09229733fbb6e4674ce983745268720703 /pkg/machine | |
| parent | 4018a9575e616ebcb3e5232c5d7c81ad6cadfc99 (diff) | |
| parent | 41528739cef3d2b61e9b7437f6c557e60dbb79c0 (diff) | |
| download | podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.tar.gz podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.tar.bz2 podman-e084f0ee1e1ded564110e84eefca9f18b5669adf.zip | |
Merge pull request #14585 from Luap99/nolint
golangci-lint: enable nolintlint
Diffstat (limited to 'pkg/machine')
| -rw-r--r-- | pkg/machine/fcos.go | 2 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index 77427139a..59ef6d975 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -139,7 +139,7 @@ func getStreamURL(streamType string) url2.URL { // This should get Exported and stay put as it will apply to all fcos downloads // getFCOS parses fedoraCoreOS's stream and returns the image download URL and the release version -func GetFCOSDownload(imageStream string) (*FcosDownloadInfo, error) { //nolint:staticcheck +func GetFCOSDownload(imageStream string) (*FcosDownloadInfo, error) { var ( fcosstable stream.Stream altMeta release.Release diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 1b0d63986..f27e40043 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -770,7 +770,7 @@ func (v *MachineVM) Stop(_ string, _ machine.StopOptions) error { if err := qmpMonitor.Disconnect(); err != nil { // FIXME: this error should probably be returned - return nil // nolint: nilerr + return nil //nolint: nilerr } disconnected = true |