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

Merge pull request #19435 from rhatdan/codespell

Browse Source 
Codespell fixups
This commit is contained in:
OpenShift Merge Robot
2023-07-31 17:50:00 +02:00
committed by GitHub
parent d351d47d49 64873e322c
commit 9e91873c26
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/quadlet/main.go
View File

@ -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 {

2
libpod/container_top_linux.go
View File

@ -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()

2
pkg/specgenutil/volumes.go
View File

@ -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)

2
test/system/252-quadlet.bats
View File

@ -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)"