vendor c/common

Update the recent events-log changes to fix the build error.

[NO NEW TESTS NEEDED] since there's no functional change.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>

vendor/github.com/containers/common/libimage/copier.go

@@ -147,15 +147,13 @@ type copier struct {
 	destinationLookup LookupReferenceFunc
 }
 
-var (
-	// storageAllowedPolicyScopes overrides the policy for local storage
-	// to ensure that we can read images from it.
-	storageAllowedPolicyScopes = signature.PolicyTransportScopes{
-		"": []signature.PolicyRequirement{
-			signature.NewPRInsecureAcceptAnything(),
-		},
-	}
-)
+// storageAllowedPolicyScopes overrides the policy for local storage
+// to ensure that we can read images from it.
+var storageAllowedPolicyScopes = signature.PolicyTransportScopes{
+	"": []signature.PolicyRequirement{
+		signature.NewPRInsecureAcceptAnything(),
+	},
+}
 
 // getDockerAuthConfig extracts a docker auth config from the CopyOptions.  Returns
 // nil if no credentials are set.

vendor/github.com/containers/common/libimage/image_config.go

@@ -95,9 +95,7 @@ func ImageConfigFromChanges(changes []string) (*ImageConfig, error) { // nolint:
 			// For now: we only support key=value
 			// We will attempt to strip quotation marks if present.
 
-			var (
-				key, val string
-			)
+			var key, val string
 
 			splitEnv := strings.SplitN(value, "=", 2)
 			key = splitEnv[0]

vendor/github.com/containers/common/libimage/inspect.go

@@ -213,7 +213,6 @@ func (i *Image) inspectInfo(ctx context.Context) (*types.ImageInspectInfo, error
 
 	ref, err := i.StorageReference()
 	if err != nil {
-
 		return nil, err
 	}
 

vendor/github.com/containers/common/libimage/manifests/copy.go

@@ -4,12 +4,10 @@ import (
 	"github.com/containers/image/v5/signature"
 )
 
-var (
-	// storageAllowedPolicyScopes overrides the policy for local storage
-	// to ensure that we can read images from it.
-	storageAllowedPolicyScopes = signature.PolicyTransportScopes{
-		"": []signature.PolicyRequirement{
-			signature.NewPRInsecureAcceptAnything(),
-		},
-	}
-)
+// storageAllowedPolicyScopes overrides the policy for local storage
+// to ensure that we can read images from it.
+var storageAllowedPolicyScopes = signature.PolicyTransportScopes{
+	"": []signature.PolicyRequirement{
+		signature.NewPRInsecureAcceptAnything(),
+	},
+}

vendor/github.com/containers/common/libimage/manifests/manifests.go

@@ -384,10 +384,8 @@ func (l *list) Add(ctx context.Context, sys *types.SystemContext, ref types.Imag
 			}
 			instanceInfo.instanceDigest = &manifestDigest
 			instanceInfo.Size = int64(len(manifestBytes))
-		} else {
-			if manifestDigest == "" {
-				manifestDigest = *instanceInfo.instanceDigest
-			}
+		} else if manifestDigest == "" {
+			manifestDigest = *instanceInfo.instanceDigest
 		}
 		err = l.List.AddInstance(*instanceInfo.instanceDigest, instanceInfo.Size, manifestType, instanceInfo.OS, instanceInfo.Architecture, instanceInfo.OSVersion, instanceInfo.OSFeatures, instanceInfo.Variant, instanceInfo.Features, instanceInfo.Annotations)
 		if err != nil {
@@ -405,9 +403,7 @@ func (l *list) Add(ctx context.Context, sys *types.SystemContext, ref types.Imag
 func (l *list) Remove(instanceDigest digest.Digest) error {
 	err := l.List.Remove(instanceDigest)
 	if err == nil {
-		if _, needToDelete := l.instances[instanceDigest]; needToDelete {
-			delete(l.instances, instanceDigest)
-		}
+		delete(l.instances, instanceDigest)
 	}
 	return err
 }

vendor/github.com/containers/common/libimage/runtime.go

@@ -74,7 +74,7 @@ func (r *Runtime) SystemContext() *types.SystemContext {
 // Returns a copy of the runtime's system context.
 func (r *Runtime) systemContextCopy() *types.SystemContext {
 	var sys types.SystemContext
-	deepcopy.Copy(&sys, &r.systemContext)
+	_ = deepcopy.Copy(&sys, &r.systemContext)
 	return &sys
 }
 

vendor/github.com/containers/common/libimage/save.go

@@ -68,7 +68,6 @@ func (r *Runtime) Save(ctx context.Context, names []string, format, path string,
 	}
 
 	return errors.Errorf("unsupported format %q for saving images", format)
-
 }
 
 // saveSingleImage saves the specified image name to the specified path.