diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/merge_zips/merge_zips.go | 7 | ||||
| -rw-r--r-- | cmd/multiproduct_kati/main.go | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cmd/merge_zips/merge_zips.go b/cmd/merge_zips/merge_zips.go index 95ff70b0..f383de90 100644 --- a/cmd/merge_zips/merge_zips.go +++ b/cmd/merge_zips/merge_zips.go @@ -250,7 +250,12 @@ func mergeZips(readers []namedZipReader, writer *zip.Writer, manifest, entrypoin addMapping(jar.MetaDir, dirSource) } - fh, buf, err := jar.ManifestFileContents(manifest) + contents, err := ioutil.ReadFile(manifest) + if err != nil { + return err + } + + fh, buf, err := jar.ManifestFileContents(contents) if err != nil { return err } diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go index 374868c1..4933f374 100644 --- a/cmd/multiproduct_kati/main.go +++ b/cmd/multiproduct_kati/main.go @@ -328,7 +328,7 @@ func main() { NumParallelJobs: runtime.NumCPU(), CompressionLevel: 5, } - if err := zip.Run(args); err != nil { + if err := zip.Zip(args); err != nil { log.Fatalf("Error zipping logs: %v", err) } } @@ -409,7 +409,7 @@ func buildProduct(mpctx *mpContext, product string) { NumParallelJobs: runtime.NumCPU(), CompressionLevel: 5, } - if err := zip.Run(args); err != nil { + if err := zip.Zip(args); err != nil { log.Fatalf("Error zipping artifacts: %v", err) } } |