diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-08-23 06:27:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 06:27:28 +1000 |
| commit | e04b2a9697512bc64d2613033274e67fbfbd26c7 (patch) | |
| tree | 7eea76e5b4e5994015f804534fad717e0e4ffaa9 /lib/ansible/utils | |
| parent | c81a1057e10ca433a99af31158ec5a0c597f6d2d (diff) | |
| download | ansible-e04b2a9697512bc64d2613033274e67fbfbd26c7.tar.gz | |
ansible-galaxy - Add timeout and progress indicator for publish and install (#60660)
* ansible-galaxy - Add timeout and progress indicator for publish
* add progress indicator to install phase as well
Diffstat (limited to 'lib/ansible/utils')
| -rw-r--r-- | lib/ansible/utils/display.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py index b0253c8317..f06777de88 100644 --- a/lib/ansible/utils/display.py +++ b/lib/ansible/utils/display.py @@ -129,7 +129,7 @@ class Display(with_metaclass(Singleton, object)): if os.path.exists(b_cow_path): self.b_cowsay = b_cow_path - def display(self, msg, color=None, stderr=False, screen_only=False, log_only=False): + def display(self, msg, color=None, stderr=False, screen_only=False, log_only=False, newline=True): """ Display a message to the user Note: msg *must* be a unicode string to prevent UnicodeError tracebacks. @@ -140,7 +140,7 @@ class Display(with_metaclass(Singleton, object)): msg = stringc(msg, color) if not log_only: - if not msg.endswith(u'\n'): + if not msg.endswith(u'\n') and newline: msg2 = msg + u'\n' else: msg2 = msg |