From: Kefu Chai <kchai@redhat.com>
Date: Tue, 21 Apr 2015 13:05:09 +0000 (+0800)
Subject: man: fix the description in NAME section
X-Git-Tag: v9.0.1~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4420%2Fhead;p=ceph.git

man: fix the description in NAME section

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/man/conf.py b/man/conf.py
index 40f1b1e03f06..2b24223b12df 100644
--- a/man/conf.py
+++ b/man/conf.py
@@ -7,27 +7,27 @@ release = 'dev'
 
 exclude_patterns = ['**/.#*', '**/*~']
 
-def _get_description(fname):
+
+def _get_description(fname, base):
     with file(fname) as f:
         one = None
-        for line in f:
-            line = line.rstrip('\n')
+        while True:
+            line = f.readline().rstrip('\n')
             if not line:
                 continue
             if line.startswith(':') and line.endswith(':'):
                 continue
             one = line
             break
-        two = f.readline()
-        three = f.readline()
-        print one, three
+        two = f.readline().rstrip('\n')
+        three = f.readline().rstrip('\n')
         assert one == three
-        assert all(c=='=' for c in one.rstrip('\n'))
-        two = two.strip()
+        assert all(c=='=' for c in one)
         name, description = two.split('--', 1)
         assert name.strip() == base
         return description.strip()
 
+
 def _get_manpages():
     src_dir = os.path.dirname(__file__)
     top_srcdir = os.path.dirname(src_dir)
@@ -43,7 +43,8 @@ def _get_manpages():
                 continue
             if base == 'index':
                 continue
-            description = os.path.join(section_dir, filename)
+            path = os.path.join(section_dir, filename)
+            description = _get_description(path, base)
             yield (
                 os.path.join(section, base),
                 base,