From 8426ada6ef2a3dffb900d6732e90e82fd8c79ed3 Mon Sep 17 00:00:00 2001
From: Abhinav Anand <abanand@redhat.com>
Date: Thu, 19 Dec 2024 17:01:30 +0530
Subject: [PATCH] Fix issue with ansible-creator --no-overwrite flag (#345)

---
 src/ansible_creator/subcommands/add.py  | 26 ++++++++++++-------------
 src/ansible_creator/subcommands/init.py | 13 ++++++-------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/ansible_creator/subcommands/add.py b/src/ansible_creator/subcommands/add.py
index 32a32fe..452d7d9 100644
--- 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
index c85a13a..a88512b 100644
--- 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: