Fix failing tests

gadget-inc · Jan 9, 2025 · c6c135e · c6c135e
1 parent 9ae67e3
commit c6c135e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/internal/files/writer.go b/internal/files/writer.go
@@ -214,7 +214,6 @@ func HardlinkDir(olddir, newdir string) error {
 
 	fastwalkConf := fastwalk.DefaultConfig.Copy()
 	fastwalkConf.Sort = fastwalk.SortDirsFirst
-	dirPermissions := rootInfo.Mode()
 
 	return fastwalk.Walk(fastwalkConf, olddir, func(oldpath string, d os.DirEntry, err error) error {
 		if err != nil {
@@ -223,8 +222,18 @@ func HardlinkDir(olddir, newdir string) error {
 
 		newpath := filepath.Join(newdir, strings.TrimPrefix(oldpath, olddir))
 
+		// The new "root" already exists so don't recreate it
+		if newpath == newdir {
+			return nil
+		}
+
 		if d.IsDir() {
-			err = os.Mkdir(newpath, dirPermissions)
+			info, err := d.Info()
+			if err != nil {
+				return fmt.Errorf("unable to get directory info %v: %w", oldpath, err)
+			}
+
+			err = os.Mkdir(newpath, info.Mode())
 			if err != nil {
 				return fmt.Errorf("cannot create dir %v: %w", newpath, err)
 			}