fix: remove implicit copyright installation (#170)

canonical · Nov 22, 2024 · 078334b · 078334b
1 parent 363f657
commit 078334b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/internal/slicer/slicer.go b/internal/slicer/slicer.go
@@ -100,8 +100,6 @@ func Run(options *RunOptions) error {
 			extract[slice.Package] = extractPackage
 		}
 		arch := pkgArchive[slice.Package].Options().Arch
-		copyrightPath := "/usr/share/doc/" + slice.Package + "/copyright"
-		hasCopyright := false
 		for targetPath, pathInfo := range slice.Contents {
 			if targetPath == "" {
 				continue
@@ -119,9 +117,6 @@ func Run(options *RunOptions) error {
 					Path:    targetPath,
 					Context: slice,
 				})
-				if sourcePath == copyrightPath && targetPath == copyrightPath {
-					hasCopyright = true
-				}
 			} else {
 				// When the content is not extracted from the package (i.e. path is
 				// not glob or copy), we add a ExtractInfo for the parent directory
@@ -136,12 +131,6 @@ func Run(options *RunOptions) error {
 				})
 			}
 		}
-		if !hasCopyright {
-			extractPackage[copyrightPath] = append(extractPackage[copyrightPath], deb.ExtractInfo{
-				Path:     copyrightPath,
-				Optional: true,
-			})
-		}
 	}
 
 	// Fetch all packages, using the selection order.

diff --git a/internal/slicer/slicer_test.go b/internal/slicer/slicer_test.go
@@ -246,7 +246,7 @@ var slicerTests = []slicerTest{{
 		"/dir/text-file-3":   "file 0644 5b41362b {test-package_myslice}",
 	},
 }, {
-	summary: "Copyright is installed",
+	summary: "Copyright is not installed implicitly",
 	slices:  []setup.SliceKey{{"test-package", "myslice"}},
 	pkgs: []*testutil.TestPackage{{
 		Name: "test-package",
@@ -265,12 +265,6 @@ var slicerTests = []slicerTest{{
 	filesystem: map[string]string{
 		"/dir/":     "dir 0755",
 		"/dir/file": "file 0644 cc55e2ec",
-		// Hardcoded copyright entries.
-		"/usr/":                                 "dir 0755",
-		"/usr/share/":                           "dir 0755",
-		"/usr/share/doc/":                       "dir 0755",
-		"/usr/share/doc/test-package/":          "dir 0755",
-		"/usr/share/doc/test-package/copyright": "file 0644 c2fca2aa",
 	},
 	manifestPaths: map[string]string{
 		"/dir/file": "file 0644 cc55e2ec {test-package_myslice}",