move archsplit to pkgMerge

monoidic · monoidic · commit edf294623cf8 · 2023-11-23T11:39:58.000+02:00
diff --git a/main.go b/main.go
@@ -1076,7 +1076,6 @@ func pkgExtract(inCh <-chan map[string]*packages.Package, outCh chan<- map[strin
 			pkgArchs[pkgArch] = pkgD
 		}
 
-		archSplit(pkgArchs)
 		outCh <- pkgArchs
 	}
 
@@ -1103,6 +1102,8 @@ func pkgMerge(inCh <-chan map[string]*pkgData, outPath string) {
 		}
 	}
 
+	archSplit(allPkgs)
+
 	data := check1(json.Marshal(allPkgs))
 
 	check(os.WriteFile(outPath, data, 0o666))

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,6 @@ func pkgExtract(inCh <-chan map[string]*packages.Package, outCh chan<- map[strin`
`1076`	`1076`	`pkgArchs[pkgArch] = pkgD`
`1077`	`1077`	`}`
`1078`	`1078`
`1079`		`- archSplit(pkgArchs)`
`1080`	`1079`	`outCh <- pkgArchs`
`1081`	`1080`	`}`
`1082`	`1081`
`@@ -1103,6 +1102,8 @@ func pkgMerge(inCh <-chan map[string]*pkgData, outPath string) {`
`1103`	`1102`	`}`
`1104`	`1103`	`}`
`1105`	`1104`
	`1105`	`+ archSplit(allPkgs)`
	`1106`	`+`
`1106`	`1107`	`data := check1(json.Marshal(allPkgs))`
`1107`	`1108`
`1108`	`1109`	`check(os.WriteFile(outPath, data, 0o666))`