fix: minor changes requested by Alberto

internal/setup/setup.go

@@ -817,7 +817,7 @@ func Select(release *Release, slices []SliceKey) (*Selection, error) {
 }
 
 // pathInfoToYAML converts a PathInfo object to a yamlPath object.
-// The returned object is going to have pointers to the given PathInfo object.
+// The returned object takes pointers to the given PathInfo object.
 func pathInfoToYAML(pi *PathInfo) (*yamlPath, error) {
 	path := &yamlPath{
 		Mode:    yamlMode(pi.Mode),

internal/setup/setup_test.go

@@ -1790,16 +1790,13 @@ func (s *S) TestPackageYAMLFormat(c *C) {
 		release, err := setup.ReadRelease(dir)
 		c.Assert(err, IsNil)
 
+		if test.expected == nil {
+			test.expected = test.input
+		}
 		for _, pkg := range release.Packages {
 			data, err := yaml.Marshal(pkg)
 			c.Assert(err, IsNil)
-			var expected string
-			if test.expected == nil || test.expected[pkg.Path] == "" {
-				expected = test.input[pkg.Path]
-			} else {
-				expected = test.expected[pkg.Path]
-			}
-			expected = string(testutil.Reindent(expected))
+			expected := string(testutil.Reindent(test.expected[pkg.Path]))
 			c.Assert(strings.TrimSpace(string(data)), Equals, strings.TrimSpace(expected))
 		}
 	}