[Python-modules-commits] r33777 - in packages/sphinx/trunk/debian (3 files)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, August 15, 2015 @ 15:05:22
  Author: mitya57
Revision: 33777

Fix message when calling sphinx-build without arguments

Added:
  packages/sphinx/trunk/debian/patches/print_help.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-08-15 14:29:34 UTC (rev 33776)
+++ packages/sphinx/trunk/debian/changelog	2015-08-15 15:05:22 UTC (rev 33777)
@@ -1,3 +1,10 @@
+sphinx (1.3.1-4) UNRELEASED; urgency=medium
+
+  * Fix message when calling sphinx-build without arguments
+    (print_help.diff; closes: #792715).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 15 Aug 2015 18:04:49 +0300
+
 sphinx (1.3.1-3) experimental; urgency=medium
 
   * Update debian/TODO with the actual information.

Added: packages/sphinx/trunk/debian/patches/print_help.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/print_help.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/print_help.diff	2015-08-15 15:05:22 UTC (rev 33777)
@@ -0,0 +1,27 @@
+Description: fix message when calling sphinx-build without arguments
+Origin: upstream, https://github.com/sphinx-doc/sphinx/commit/21188120cc86e516
+Last-Update: 2015-08-15
+
+--- a/sphinx/cmdline.py
++++ b/sphinx/cmdline.py
+@@ -27,11 +27,6 @@
+ from sphinx.util.pycompat import terminal_safe
+ 
+ 
+-def usage(argv, msg=None):
+-    if msg:
+-        print(msg, file=sys.stderr)
+-        print(file=sys.stderr)
+-
+ USAGE = """\
+ Sphinx v%s
+ Usage: %%prog [options] sourcedir outdir [filenames...]
+@@ -150,7 +145,7 @@
+             return 1
+         outdir = abspath(args[1])
+     except IndexError:
+-        usage(argv, 'Error: Insufficient arguments.')
++        parser.print_help()
+         return 1
+     except UnicodeError:
+         print(

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-08-15 14:29:34 UTC (rev 33776)
+++ packages/sphinx/trunk/debian/patches/series	2015-08-15 15:05:22 UTC (rev 33777)
@@ -6,3 +6,4 @@
 no_theme_rename_warning.diff
 source_date_epoch.diff
 addto_only_babel.diff
+print_help.diff