]>
Commit | Line | Data |
---|---|---|
732967a5 | 1 | diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py |
2 | --- calibre/src/calibre/linux.py.manpages 2010-04-10 19:34:42.632332811 +0300 | |
3 | +++ calibre/src/calibre/linux.py 2010-04-10 19:34:50.404207554 +0300 | |
4 | @@ -339,7 +339,7 @@ class PostInstall: | |
5 | continue | |
6 | parser = parser() | |
7 | raw = create_man_page(prog, parser) | |
8 | - if isfreebsd: | |
9 | + if isfreebsd or islinux: | |
10 | manfile = os.path.join(manpath, prog+'.1') | |
11 | else: | |
12 | manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') | |
13 | diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py | |
14 | --- calibre/src/calibre/utils/help2man.py.manpages 2010-04-10 19:30:51.670926847 +0300 | |
15 | +++ calibre/src/calibre/utils/help2man.py 2010-04-10 19:32:27.842332121 +0300 | |
16 | @@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi | |
17 | __docformat__ = 'restructuredtext en' | |
18 | ||
19 | import time, bz2 | |
20 | -from calibre.constants import isfreebsd | |
21 | +from calibre.constants import isfreebsd, islinux | |
22 | ||
23 | from calibre.constants import __version__, __appname__, __author__ | |
24 | ||
25 | @@ -58,9 +58,7 @@ def create_man_page(prog, parser): | |
26 | lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for | |
27 | x in lines] | |
28 | ||
29 | - if not isfreebsd: | |
30 | - return bz2.compress((u'\n'.join(lines)).encode('utf-8')) | |
31 | - else: | |
32 | + if isfreebsd or islinux: | |
33 | return (u'\n'.join(lines)).encode('utf-8') | |
34 | - | |
35 | - | |
36 | + else: | |
37 | + return bz2.compress((u'\n'.join(lines)).encode('utf-8')) |