Skip to content

Commit a9ee6ac

Browse files
committed
remove unused ManifestSlices
1 parent 8445042 commit a9ee6ac

3 files changed

Lines changed: 7 additions & 16 deletions

File tree

‎internal/manifest/manifest.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,10 @@ func FindPaths(slices []*setup.Slice) map[string][]*setup.Slice {
183183
type WriteOptions struct {
184184
PackageInfo []*archive.PackageInfo
185185
Selection []*setup.Slice
186-
// Map manifest path to all the slices that declare it. See
187-
// manifest.FindPaths.
188-
ManifestSlices map[string][]*setup.Slice
189-
Report *Report
186+
Report *Report
190187
}
191188

192189
func Write(options *WriteOptions, writer io.Writer) error {
193-
if len(options.ManifestSlices) == 0 {
194-
// Nothing to do.
195-
return nil
196-
}
197190
dbw := jsonwall.NewDBWriter(&jsonwall.DBWriterOptions{
198191
Schema: Schema,
199192
})
@@ -270,6 +263,9 @@ func manifestAddSlices(dbw *jsonwall.DBWriter, slices []*setup.Slice) error {
270263
}
271264

272265
func manifestAddReport(dbw *jsonwall.DBWriter, report *Report) error {
266+
if report == nil {
267+
return nil
268+
}
273269
for _, entry := range report.Entries {
274270
sliceNames := []string{}
275271
for slice := range entry.Slices {

‎internal/manifest/manifest_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,6 @@ func (s *S) TestGenerateManifests(c *C) {
357357
}
358358

359359
options := &manifest.WriteOptions{
360-
ManifestSlices: map[string][]*setup.Slice{
361-
"/dir/manifest.wall": {slice1},
362-
"/other-dir/manifest.wall": {slice1},
363-
},
364360
PackageInfo: packageInfo,
365361
Selection: []*setup.Slice{slice1, slice2},
366362
Report: report,

‎internal/slicer/slicer.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,9 @@ func generateManifests(targetDir string, selection *setup.Selection,
367367
}
368368
defer w.Close()
369369
writeOptions := &manifest.WriteOptions{
370-
ManifestSlices: manifestSlices,
371-
PackageInfo: pkgInfos,
372-
Selection: selection.Slices,
373-
Report: report,
370+
PackageInfo: pkgInfos,
371+
Selection: selection.Slices,
372+
Report: report,
374373
}
375374
err = manifest.Write(writeOptions, w)
376375
return err

0 commit comments

Comments
 (0)