mirror of https://github.com/containers/podman.git
Fix spelling "setup" -> "set up" and similar
* Replace "setup", "lookup", "cleanup", "backup" with "set up", "look up", "clean up", "back up" when used as verbs. Replace also variations of those. * Improve language in a few places. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
This commit is contained in:
parent
ca26d44d3b
commit
aa4279ae15
|
@ -1880,7 +1880,7 @@ func (c *Container) cleanup(ctx context.Context) error {
|
|||
// we cannot use the dependency container lock due ABBA deadlocks
|
||||
if lock, err := lockfile.GetLockfile(hoststFile); err == nil {
|
||||
lock.Lock()
|
||||
// make sure to ignore ENOENT error in case the netns container was cleanup before this one
|
||||
// make sure to ignore ENOENT error in case the netns container was cleaned up before this one
|
||||
if err := etchosts.Remove(hoststFile, getLocalhostHostEntry(c)); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||
// this error is not fatal we still want to do proper cleanup
|
||||
logrus.Errorf("failed to remove hosts entry from the netns containers /etc/hosts: %v", err)
|
||||
|
|
|
@ -1210,7 +1210,7 @@ func (c *Container) createCheckpointImage(ctx context.Context, options Container
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Clean-up buildah working container
|
||||
// Clean up buildah working container
|
||||
defer func() {
|
||||
if err := importBuilder.Delete(); err != nil {
|
||||
logrus.Errorf("Image builder delete failed: %v", err)
|
||||
|
|
|
@ -755,7 +755,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
|
|||
if cleanupErr == nil {
|
||||
cleanupErr = err
|
||||
} else {
|
||||
logrus.Errorf("Cleanup storage: %v", err)
|
||||
logrus.Errorf("Cleaning up storage: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -810,11 +810,11 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
|
|||
// Ignore error, since podman will report original error
|
||||
volumesFrom, _ := c.volumesFrom()
|
||||
if len(volumesFrom) > 0 {
|
||||
logrus.Debugf("Cleanup volume not possible since volume is in use (%s)", v)
|
||||
logrus.Debugf("Cleaning up volume not possible since volume is in use (%s)", v)
|
||||
continue
|
||||
}
|
||||
}
|
||||
logrus.Errorf("Cleanup volume (%s): %v", v, err)
|
||||
logrus.Errorf("Cleaning up volume (%s): %v", v, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -964,7 +964,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol
|
|||
continue
|
||||
}
|
||||
if err := r.removeVolume(ctx, volume, false, timeout); err != nil && err != define.ErrNoSuchVolume && err != define.ErrVolumeBeingUsed {
|
||||
logrus.Errorf("Cleanup volume (%s): %v", v, err)
|
||||
logrus.Errorf("Cleaning up volume (%s): %v", v, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,7 +183,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
|
|||
if err != nil {
|
||||
// Issue #7384 and #11384: If the container is configured for
|
||||
// auto-removal, it might already have been removed at this point.
|
||||
// We still need to to cleanup since we do not know if the other cleanup process is successful
|
||||
// We still need to clean up since we do not know if the other cleanup process is successful
|
||||
if c.AutoRemove() && (errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved)) {
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -112,7 +112,7 @@ func (n UsernsMode) IsDefaultValue() bool {
|
|||
return n == "" || n == defaultType
|
||||
}
|
||||
|
||||
// GetAutoOptions returns a AutoUserNsOptions with the settings to setup automatically
|
||||
// GetAutoOptions returns a AutoUserNsOptions with the settings to automatically set up
|
||||
// a user namespace.
|
||||
func (n UsernsMode) GetAutoOptions() (*types.AutoUserNsOptions, error) {
|
||||
parts := strings.SplitN(string(n), ":", 2)
|
||||
|
|
Loading…
Reference in New Issue