diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-22 15:14:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-22 15:14:38 +0100 |
commit | 901066acd113ee3bea709cc558d86c4c438e2f67 (patch) | |
tree | 018a8f7918b50e9d1bc58f7ce9a981f628c3d295 /pkg/systemd | |
parent | fc963159b8078c7e3ca6571174fb3a82d1023b43 (diff) | |
parent | 06dd9136a253521cb74497a59f2e6894806a5b6d (diff) | |
download | podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.gz podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.bz2 podman-901066acd113ee3bea709cc558d86c4c438e2f67.zip |
Merge pull request #13580 from vrothberg/enable-linters
enable linters
Diffstat (limited to 'pkg/systemd')
-rw-r--r-- | pkg/systemd/dbus.go | 1 | ||||
-rw-r--r-- | pkg/systemd/generate/containers.go | 4 | ||||
-rw-r--r-- | pkg/systemd/generate/pods.go | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index 1b1bc8be9..44feb8308 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -24,7 +24,6 @@ func IsSystemdSessionValid(uid int) bool { if rootless.IsRootless() { conn, err = GetLogindConnection(rootless.GetRootlessUID()) - object = conn.Object(dbusDest, godbus.ObjectPath(dbusPath)) if err != nil { //unable to fetch systemd object for logind logrus.Debugf("systemd-logind: %s", err) diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index c01bb1baf..e11aed771 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -362,7 +362,9 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst fs.StringArrayP("env", "e", nil, "") fs.String("sdnotify", "", "") fs.String("restart", "", "") - fs.Parse(remainingCmd) + if err := fs.Parse(remainingCmd); err != nil { + return "", fmt.Errorf("parsing remaining command-line arguments: %w", err) + } remainingCmd = filterCommonContainerFlags(remainingCmd, fs.NArg()) // If the container is in a pod, make sure that the diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 78ae6391b..15b598ae8 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -335,7 +335,9 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions) fs.SetInterspersed(false) fs.String("name", "", "") fs.Bool("replace", false, "") - fs.Parse(podCreateArgs) + if err := fs.Parse(podCreateArgs); err != nil { + return "", fmt.Errorf("parsing remaining command-line arguments: %w", err) + } hasNameParam := fs.Lookup("name").Changed hasReplaceParam, err := fs.GetBool("replace") |