fix: add more checks for existing approot (ddev#6208)

jonesrussell · Jun 9, 2024 · 4384cb8 · 4384cb8
1 parent 67ad31b
commit 4384cb8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/cmd/ddev/cmd/config.go b/cmd/ddev/cmd/config.go
@@ -384,6 +384,11 @@ func handleMainConfigArgs(cmd *cobra.Command, _ []string, app *ddevapp.DdevApp)
 		app.Name = filepath.Base(pwd)
 	}
 
+	err = app.CheckExistingAppInApproot()
+	if err != nil {
+		util.Failed(err.Error())
+	}
+
 	// Ensure that the docroot exists
 	if docrootRelPathArg != "" {
 		app.Docroot = docrootRelPathArg

diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -1244,6 +1244,12 @@ func (app *DdevApp) promptForName() error {
 		return err
 	}
 	app.Name = name
+
+	err := app.CheckExistingAppInApproot()
+	if err != nil {
+		util.Failed(err.Error())
+	}
+
 	return nil
 }