From 64873e322cf1a0b7b81c1055c37408e50a103eeb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 30 Jul 2023 09:02:15 -0400 Subject: [PATCH] Codespell fixups Signed-off-by: Daniel J Walsh --- cmd/quadlet/main.go | 4 ++-- libpod/container_top_linux.go | 2 +- pkg/specgenutil/volumes.go | 2 +- test/system/252-quadlet.bats | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go index 5cc17f7e08..a261ab9d28 100644 --- a/cmd/quadlet/main.go +++ b/cmd/quadlet/main.go @@ -160,8 +160,8 @@ func appendSubPaths(dirs []string, path string, isUserFlag bool, filterPtr func( } func nonNumericFilter(_path string, isUserFlag bool) bool { - // when running in rootless, only recrusive walk directories that are non numeric - // ignore sub dirs under the user directory that may correspond to a user id + // when running in rootless, recursive walk directories that are non numeric + // ignore sub dirs under the `users` directory which correspond to a user id if strings.Contains(_path, filepath.Join(quadlet.UnitDirAdmin, "users")) { listDirUserPathLevels := strings.Split(_path, string(os.PathSeparator)) if len(listDirUserPathLevels) > SystemUserDirLevel { diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index e460902083..25f7f31d21 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -345,7 +345,7 @@ func (c *Container) execPS(psArgs []string) ([]string, bool, error) { return stdout, retryContainerExec, err } -// execPS executes ps(1) with the specified args in the container vie exec session. +// execPS executes ps(1) with the specified args in the container via exec session. // This should be a bit safer then execPS() but it requires ps(1) to be installed in the container. func (c *Container) execPSinContainer(args []string) ([]string, error) { rPipe, wPipe, err := os.Pipe() diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index d3751cb29d..6dae9d1b66 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -272,7 +272,7 @@ func Mounts(mountFlag []string, configMounts []string) (map[string]spec.Mount, m } // If user specified a mount flag that conflicts with a containers.conf flag, then ignore - // the duplicate. This means that the parseing of containers.conf configMounts, should always + // the duplicate. This means that the parsing of the containers.conf configMounts should always // happen second. if err := parseMounts(configMounts, true); err != nil { return nil, nil, nil, fmt.Errorf("parsing containers.conf mounts: %w", err) diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats index f6ebbc8ce7..f836e44765 100644 --- a/test/system/252-quadlet.bats +++ b/test/system/252-quadlet.bats @@ -16,7 +16,7 @@ function start_time() { function setup() { skip_if_remote "quadlet tests are meaningless over remote" skip_if_rootless_cgroupsv1 "Can't use --cgroups=split w/ CGv1 (issue 17456, wontfix)" - skip_if_journald_unavailable "Needed for RHEL. FIXME: we might be able to reenable a subset of tests." + skip_if_journald_unavailable "Needed for RHEL. FIXME: we might be able to re-enable a subset of tests." test -x "$QUADLET" || die "Cannot run quadlet tests without executable \$QUADLET ($QUADLET)"