Merge branch '1.5'

Conflicts:
	docs/changelog.rst

.travis.yml

@@ -12,8 +12,6 @@ install:
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install multiprocessing; fi"
 script: fab test
 notifications:
-  email:
-    on_failure: change
   irc:
     channels: "irc.freenode.org#fabric"
     on_success: change

docs/changelog.rst

@@ -31,6 +31,8 @@ Changelog
 * :feature:`249` Allow specification of remote command timeout value by
   setting :ref:`env.command_timeout <command_timeout>`. Thanks to Paul
   McMillan for suggestion & initial patch.
+* Added current host string to prompt abort error messages.
+* :release:`1.5.1 <2012-11-15>`
 * :bug:`776` Fixed serious-but-non-obvious bug in direct-tcpip driven
   gatewaying (e.g. that triggered by ``-g`` or ``env.gateway``.) Should work
   correctly now.

fabric/utils.py

@@ -128,7 +128,9 @@ def fastprint(text, show_prefix=False, end="", flush=True):
 
 def handle_prompt_abort(prompt_for):
     import fabric.state
-    reason = "Needed to prompt for %s, but %%s" % prompt_for
+    reason = "Needed to prompt for %s (host: %s), but %%s" % (
+        prompt_for, fabric.state.env.host_string
+    )
     # Explicit "don't prompt me bro"
     if fabric.state.env.abort_on_prompts:
         abort(reason % "abort-on-prompts was set to True")

fabric/version.py

@@ -9,7 +9,7 @@
 from os.path import abspath, dirname
 
 
-VERSION = (1, 5, 0, 'final', 0)
+VERSION = (1, 5, 1, 'final', 0)
 
 
 def git_sha():