use IsDir() in favour of bit mask

canonical · Mar 6, 2024 · b2d22d9 · b2d22d9
1 parent 622e346
commit b2d22d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/internal/deb/extract_test.go b/internal/deb/extract_test.go
@@ -2,7 +2,6 @@ package deb_test
 
 import (
 	"bytes"
-	"io/fs"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -333,7 +332,7 @@ func (s *S) TestExtract(c *C) {
 		createdPaths := make(map[string]bool)
 		options.Create = func(_ *deb.ExtractInfo, o *fsutil.CreateOptions) error {
 			relPath := filepath.Clean("/" + strings.TrimPrefix(o.Path, dir))
-			if o.Mode&fs.ModeDir != 0 {
+			if o.Mode.IsDir() {
 				relPath = relPath + "/"
 			}
 			createdPaths[relPath] = true

diff --git a/internal/slicer/report.go b/internal/slicer/report.go
@@ -42,7 +42,7 @@ func (r *Report) Add(slice *setup.Slice, fsEntry *fsutil.Entry) error {
 		return fmt.Errorf("cannot add path %q outside of root %q", fsEntry.Path, r.Root)
 	}
 	relPath := filepath.Clean("/" + strings.TrimPrefix(fsEntry.Path, r.Root))
-	if fsEntry.Mode&fs.ModeDir != 0 {
+	if fsEntry.Mode.IsDir() {
 		relPath = relPath + "/"
 	}
 

diff --git a/internal/slicer/slicer.go b/internal/slicer/slicer.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -175,7 +174,7 @@ func Run(options *RunOptions) (*Report, error) {
 				// Check whether the file was created because it matched a glob.
 				if strings.ContainsAny(extractInfo.Path, "*?") {
 					relPath := filepath.Clean("/" + strings.TrimLeft(o.Path, targetDir))
-					if o.Mode&fs.ModeDir != 0 {
+					if o.Mode.IsDir() {
 						relPath = relPath + "/"
 					}
 					globbedPaths[extractInfo.Path] = append(globbedPaths[extractInfo.Path], relPath)