upstream/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-05-28 04:32:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix mer

Browse source
This commit is contained in:
Brian Coca 2025-06-10 17:26:04 -04:00
parent 07c4e775bf
commit 69fac34070
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/utils/display.py
View file

@ -883,7 +883,6 @@ class Display(metaclass=Singleton):
(out, err) = cmd.communicate()
self.display(u"%s\n" % to_text(out), color=color, nowrap=True)
<<<<<<< HEAD
def error_as_warning(
self,
msg: str | None,
@ -936,14 +935,6 @@ class Display(metaclass=Singleton):
event = _error_factory.ControllerEventFactory.from_exception(msg, _traceback.is_traceback_enabled(_traceback.TracebackEvent.ERROR))
wrap_text = False
=======
@_proxy
def error(self, msg: str, wrap_text: bool = C.NOTTY_WRAP) -> None:
if wrap_text:
new_msg = u"\n[ERROR]: %s" % msg
wrapped = textwrap.wrap(new_msg, self.columns)
new_msg = u"\n".join(wrapped) + u"\n"
>>>>>>> 175789f85e7 (no tty, no wrap)
else:
event = _messages.Event(
msg=msg,