remove override mode for dirs

internal/deb/extract.go

@@ -251,9 +251,6 @@ func extractData(dataReader io.Reader, options *ExtractOptions) error {
 					Path:        filepath.Join(options.TargetDir, path),
 					Mode:        mode,
 					MakeParents: true,
-					// We dont want this implicit parent directory to overwrite
-					// an existing directory.
-					OverrideMode: false,
 				}
 				err := options.Create(nil, createOptions)
 				if err != nil {

internal/fsutil/create.go

@@ -16,8 +16,6 @@ type CreateOptions struct {
 	Mode fs.FileMode
 	Data io.Reader
 	Link string
-	// If OverrideMode is true and a directory exists, its mode will be modified.
-	OverrideMode bool
 	// If MakeParents is true, missing parent directories of Path are
 	// created with permissions 0755.
 	MakeParents bool
@@ -76,10 +74,7 @@ func createDir(o *CreateOptions) error {
 	debugf("Creating directory: %s (mode %#o)", o.Path, o.Mode)
 	err := os.Mkdir(o.Path, o.Mode)
 	if os.IsExist(err) {
-		if !o.OverrideMode {
-			return nil
-		}
-		err = os.Chmod(o.Path, o.Mode)
+		return nil
 	}
 	return err
 }

internal/fsutil/create_test.go

@@ -70,9 +70,8 @@ var createTests = []createTest{{
 	error: `.*: no such file or directory`,
 }, {
 	options: fsutil.CreateOptions{
-		Path:         "foo",
-		Mode:         fs.ModeDir | 0775,
-		OverrideMode: false,
+		Path: "foo",
+		Mode: fs.ModeDir | 0775,
 	},
 	hackdir: func(c *C, dir string) {
 		c.Assert(os.Mkdir(filepath.Join(dir, "foo/"), fs.ModeDir|0765), IsNil)
@@ -81,19 +80,6 @@ var createTests = []createTest{{
 		// mode is not updated.
 		"/foo/": "dir 0765",
 	},
-}, {
-	options: fsutil.CreateOptions{
-		Path:         "foo",
-		Mode:         fs.ModeDir | 0775,
-		OverrideMode: true,
-	},
-	hackdir: func(c *C, dir string) {
-		c.Assert(os.Mkdir(filepath.Join(dir, "foo/"), fs.ModeDir|0765), IsNil)
-	},
-	result: map[string]string{
-		// mode is updated.
-		"/foo/": "dir 0775",
-	},
 }}
 
 func (s *S) TestCreate(c *C) {