summaryrefslogtreecommitdiff
path: root/libpod/options.go
diff options
context:
space:
mode:
authorflouthoc <flouthoc.git@gmail.com>2021-08-16 17:12:16 +0530
committerflouthoc <flouthoc.git@gmail.com>2021-08-17 16:14:02 +0530
commit3cee85531c43e7c66a6428b60b73925b2fcefcac (patch)
tree287777dcd49d5ec0c20538dcf0852c032cef04ed /libpod/options.go
parentf985699460317be7428d775509ec822fc5be0e25 (diff)
downloadpodman-3cee85531c43e7c66a6428b60b73925b2fcefcac.tar.gz
podman-3cee85531c43e7c66a6428b60b73925b2fcefcac.tar.bz2
podman-3cee85531c43e7c66a6428b60b73925b2fcefcac.zip
libpod/option.go remove error stutter from wrap/wraf
[NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Diffstat (limited to 'libpod/options.go')
-rw-r--r--libpod/options.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/libpod/options.go b/libpod/options.go
index 89901b094..59aec66c6 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -268,7 +268,7 @@ func WithRegistriesConf(path string) RuntimeOption {
logrus.Debugf("Setting custom registries.conf: %q", path)
return func(rt *Runtime) error {
if _, err := os.Stat(path); err != nil {
- return errors.Wrap(err, "error locating specified registries.conf")
+ return errors.Wrap(err, "locating specified registries.conf")
}
if rt.imageContext == nil {
rt.imageContext = &types.SystemContext{
@@ -1453,11 +1453,7 @@ func WithNamedVolumes(volumes []*ContainerNamedVolume) CtrCreateOption {
for _, vol := range volumes {
mountOpts, err := util.ProcessOptions(vol.Options, false, "")
if err != nil {
- return errors.Wrapf(err, "error processing options for named volume %q mounted at %q", vol.Name, vol.Dest)
- }
-
- if err = parse.ValidateVolumeCtrDir(vol.Dest); err != nil {
- return errors.Wrapf(err, "error validating destination path for named volume %q mounted at %q", vol.Name, vol.Dest)
+ return errors.Wrapf(err, "processing options for named volume %q mounted at %q", vol.Name, vol.Dest)
}
ctr.config.NamedVolumes = append(ctr.config.NamedVolumes, &ContainerNamedVolume{