github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-09 10:28:23 +00:00
Code Issues Projects Releases Wiki Activity

Drop redundant fmt.Sprintf inside erorrs.Wrapf/Errorf

Browse Source 
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2020-05-22 03:29:10 +02:00 committed by Valentin Rothberg
parent c5183d0e34
commit c103d65284
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/skopeo/sync.go
View File

@ -152,15 +152,14 @@ func destinationReference(destination string, transport string) (types.ImageRefe
case directory.Transport.Name(): case directory.Transport.Name():
_, err := os.Stat(destination) _, err := os.Stat(destination)
if err == nil { if err == nil {
return nil, errors.Errorf(fmt.Sprintf("Refusing to overwrite destination directory %q", destination)) return nil, errors.Errorf("Refusing to overwrite destination directory %q", destination)
} }
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return nil, errors.Wrap(err, "Destination directory could not be used") return nil, errors.Wrap(err, "Destination directory could not be used")
} }
// the directory holding the image must be created here // the directory holding the image must be created here
if err = os.MkdirAll(destination, 0755); err != nil { if err = os.MkdirAll(destination, 0755); err != nil {
return nil, errors.Wrapf(err, fmt.Sprintf("Error creating directory for image %s", return nil, errors.Wrapf(err, "Error creating directory for image %s", destination)
destination))
} }
imageTransport = directory.Transport imageTransport = directory.Transport
default: default:
@ -170,7 +169,7 @@ func destinationReference(destination string, transport string) (types.ImageRefe
destRef, err := imageTransport.ParseReference(destination) destRef, err := imageTransport.ParseReference(destination)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, fmt.Sprintf("Cannot obtain a valid image reference for transport %q and reference %q", imageTransport.Name(), destination)) return nil, errors.Wrapf(err, "Cannot obtain a valid image reference for transport %q and reference %q", imageTransport.Name(), destination)
} }
return destRef, nil return destRef, nil
@ -200,7 +199,7 @@ func getImageTags(ctx context.Context, sysCtx *types.SystemContext, repoRef refe
logrus.Warnf("Registry disallows tag list retrieval: %s", err) logrus.Warnf("Registry disallows tag list retrieval: %s", err)
break break
default: default:
return tags, errors.Wrapf(err, fmt.Sprintf("Error determining repository tags for image %s", name)) return tags, errors.Wrapf(err, "Error determining repository tags for image %s", name)
} }
return tags, nil return tags, nil
@ -245,7 +244,7 @@ func imagesToCopyFromDir(dirPath string) ([]types.ImageReference, error) {
dirname := filepath.Dir(path) dirname := filepath.Dir(path)
ref, err := directory.Transport.ParseReference(dirname) ref, err := directory.Transport.ParseReference(dirname)
if err != nil { if err != nil {
return errors.Wrapf(err, fmt.Sprintf("Cannot obtain a valid image reference for transport %q and reference %q", directory.Transport.Name(), dirname)) return errors.Wrapf(err, "Cannot obtain a valid image reference for transport %q and reference %q", directory.Transport.Name(), dirname)
} }
sourceReferences = append(sourceReferences, ref) sourceReferences = append(sourceReferences, ref)
return filepath.SkipDir return filepath.SkipDir
@ -255,7 +254,7 @@ func imagesToCopyFromDir(dirPath string) ([]types.ImageReference, error) {
if err != nil { if err != nil {
return sourceReferences, return sourceReferences,
errors.Wrapf(err, fmt.Sprintf("Error walking the path %q", dirPath)) errors.Wrapf(err, "Error walking the path %q", dirPath)
} }
return sourceReferences, nil return sourceReferences, nil
@ -563,7 +562,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) error {
_, err = copy.Image(ctx, policyContext, destRef, ref, &options) _, err = copy.Image(ctx, policyContext, destRef, ref, &options)
if err != nil { if err != nil {
return errors.Wrapf(err, fmt.Sprintf("Error copying tag %q", transports.ImageName(ref))) return errors.Wrapf(err, "Error copying tag %q", transports.ImageName(ref))
} }
imagesNumber++ imagesNumber++
} }