Fix issue with ansible-creator --no-overwrite flag (#345)

ansible · Dec 19, 2024 · 8426ada · 8426ada
1 parent ff8705e
commit 8426ada
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/ansible_creator/subcommands/add.py b/src/ansible_creator/subcommands/add.py
@@ -134,13 +134,12 @@ def _perform_resource_scaffold(self, template_data: TemplateData) -> None:
         paths = walker.collect_paths()
         copier = Copier(output=self.output)
 
-        if self._no_overwrite:
-            msg = "The flag `--no-overwrite` restricts overwriting."
-            if paths.has_conflicts():
-                msg += (
-                    "\nThe destination directory contains files that can be overwritten."
-                    "\nPlease re-run ansible-creator with --overwrite to continue."
-                )
+        if self._no_overwrite and paths.has_conflicts():
+            msg = (
+                "The flag `--no-overwrite` restricts overwriting."
+                "\nThe destination directory contains files that can be overwritten."
+                "\nPlease re-run ansible-creator with --overwrite to continue."
+            )
             raise CreatorError(msg)
 
         if not paths.has_conflicts() or self._force or self._overwrite:
@@ -206,13 +205,12 @@ def _perform_plugin_scaffold(self, template_data: TemplateData, plugin_path: Pat
         paths = walker.collect_paths()
         copier = Copier(output=self.output)
 
-        if self._no_overwrite:
-            msg = "The flag `--no-overwrite` restricts overwriting."
-            if paths.has_conflicts():
-                msg += (
-                    "\nThe destination directory contains files that can be overwritten."
-                    "\nPlease re-run ansible-creator with --overwrite to continue."
-                )
+        if self._no_overwrite and paths.has_conflicts():
+            msg = (
+                "The flag `--no-overwrite` restricts overwriting."
+                "\nThe destination directory contains files that can be overwritten."
+                "\nPlease re-run ansible-creator with --overwrite to continue."
+            )
             raise CreatorError(msg)
 
         if not paths.has_conflicts() or self._force or self._overwrite:

diff --git a/src/ansible_creator/subcommands/init.py b/src/ansible_creator/subcommands/init.py
@@ -143,13 +143,12 @@ def _scaffold(self) -> None:
             output=self.output,
         )
 
-        if self._no_overwrite:
-            msg = "The flag `--no-overwrite` restricts overwriting."
-            if paths.has_conflicts():
-                msg += (
-                    "\nThe destination directory contains files that can be overwritten."
-                    "\nPlease re-run ansible-creator with --overwrite to continue."
-                )
+        if self._no_overwrite and paths.has_conflicts():
+            msg = (
+                "The flag `--no-overwrite` restricts overwriting."
+                "\nThe destination directory contains files that can be overwritten."
+                "\nPlease re-run ansible-creator with --overwrite to continue."
+            )
             raise CreatorError(msg)
 
         if not paths.has_conflicts() or self._force or self._overwrite: