Merge branch '1.2'

spookylukey · Sep 2, 2011 · 944c68b · 944c68b
2 parents b17ad7c + 6875a14
commit 944c68b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -25,6 +25,10 @@ would have also been included in the 1.2 line.
 Changelog
 =========
 
+* :bug:`430` Tasks decorated with `~fabric.decorators.runs_once` printed
+  extraneous 'Executing...' status lines on subsequent invocations. This is
+  noisy at best and misleading at worst, and has been corrected. Thanks to
+  Jacob Kaplan-Moss for the report.
 * :release:`1.2.2 <2011-09-01>`
 * :release:`1.1.4 <2011-09-01>`
 * :release:`1.0.4 <2011-09-01>`

diff --git a/fabric/main.py b/fabric/main.py
@@ -767,7 +767,7 @@ def main():
                 # Split host string and apply to env dict
                 username, hostname, port = interpret_host_string(host)
                 # Log to stdout
-                if state.output.running:
+                if state.output.running and not hasattr(task, 'return_value'):
                     print("[%s] Executing task '%s'" % (host, name))
                 # Actually run command
                 _run_task(task, args, kwargs)