Flip "listing commands" flag in main.py if --shortlist is given.

Fixes fabric#396
spookylukey · Sep 1, 2011 · cfab5ec · cfab5ec
1 parent 06cd63e
commit cfab5ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
 Changelog
 =========
 
+* :bug:`396` :option:`--shortlist` broke after the addition of
+  :option:`--list-format <-F>` and no longer displayed the short list format
+  correctly. This has been fixed.
 * :bug:`373` Re-added missing functionality preventing :ref:`host exclusion
   <excluding-hosts>` from working correctly.
 * :bug:`303` Updated terminal size detection to correctly skip over non-tty

diff --git a/fabric/main.py b/fabric/main.py
@@ -678,6 +678,7 @@ def main():
         # it overrides use of --list-format if somebody were to specify both
         if options.shortlist:
             options.list_format = 'short'
+            options.list_commands = True
 
         # List available commands
         if options.list_commands: