Merge pull request #57 from AliyunContainerService/bugfix/ineffectual…

…-assignment-fix ineffectual assignment fix
AliyunContainerService · Nov 20, 2020 · 3b2623e · 3b2623e
2 parents f60664f + 3b39fa9
commit 3b2623e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/sync/manifest.go b/pkg/sync/manifest.go
@@ -38,9 +38,13 @@ func ManifestHandler(m []byte, t string, i *ImageSource) ([]manifest.Manifest, e
 			if err != nil {
 				return nil, err
 			}
+
 			platformSpecManifest, err := ManifestHandler(manifestByte, manifestType, i)
-			manifestInfoSlice = append(manifestInfoSlice, platformSpecManifest...)
+			if err != nil {
+				return nil, err
+			}
 
+			manifestInfoSlice = append(manifestInfoSlice, platformSpecManifest...)
 		}
 		return manifestInfoSlice, nil
 	}

diff --git a/pkg/sync/task.go b/pkg/sync/task.go
@@ -91,7 +91,12 @@ func (t *Task) Run() error {
 		for _, manifestDescriptorElem := range manifestSchemaListInfo.Manifests {
 
 			t.Infof("handle manifest OS:%s Architecture:%s ", manifestDescriptorElem.Platform.OS, manifestDescriptorElem.Platform.Architecture)
-			subManifestByte, manifestType, err = t.source.source.GetManifest(t.source.ctx, &manifestDescriptorElem.Digest)
+
+			subManifestByte, _, err = t.source.source.GetManifest(t.source.ctx, &manifestDescriptorElem.Digest)
+			if err != nil {
+				return t.Errorf("Get manifest %v of OS:%s Architecture:%s for manifest list error: %v", manifestDescriptorElem.Digest, manifestDescriptorElem.Platform.OS, manifestDescriptorElem.Platform.Architecture, err)
+			}
+
 			if err := t.destination.PushManifest(subManifestByte); err != nil {
 				return t.Errorf("Put manifest to %s/%s:%s error: %v", t.destination.GetRegistry(), t.destination.GetRepository(), t.destination.GetTag(), err)
 			}