]>
Commit | Line | Data |
---|---|---|
ebcf5a5e | 1 | diff -Nur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py |
2 | --- calibre.orig/src/calibre/linux.py 2011-05-27 10:42:14.000000000 -0600 | |
3 | +++ calibre/src/calibre/linux.py 2011-05-27 20:06:53.461866793 -0600 | |
4 | @@ -319,7 +319,7 @@ | |
732967a5 | 5 | continue |
6 | parser = parser() | |
7 | raw = create_man_page(prog, parser) | |
ebcf5a5e | 8 | - if isbsd: |
9 | + if isbsd or islinux: | |
732967a5 | 10 | manfile = os.path.join(manpath, prog+'.1') |
11 | else: | |
12 | manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') | |
ebcf5a5e | 13 | diff -Nur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py |
14 | --- calibre.orig/src/calibre/utils/help2man.py 2011-05-27 10:42:14.000000000 -0600 | |
15 | +++ calibre/src/calibre/utils/help2man.py 2011-05-27 20:08:28.314256418 -0600 | |
16 | @@ -4,7 +4,7 @@ | |
732967a5 | 17 | __docformat__ = 'restructuredtext en' |
18 | ||
19 | import time, bz2 | |
ebcf5a5e | 20 | -from calibre.constants import isbsd |
21 | +from calibre.constants import isbsd, islinux | |
732967a5 | 22 | |
23 | from calibre.constants import __version__, __appname__, __author__ | |
24 | ||
ebcf5a5e | 25 | @@ -58,9 +58,9 @@ |
732967a5 | 26 | lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for |
27 | x in lines] | |
28 | ||
ebcf5a5e | 29 | - if not isbsd: |
732967a5 | 30 | - return bz2.compress((u'\n'.join(lines)).encode('utf-8')) |
31 | - else: | |
ebcf5a5e | 32 | + if isbsd or islinux: |
732967a5 | 33 | return (u'\n'.join(lines)).encode('utf-8') |
732967a5 | 34 | + else: |
35 | + return bz2.compress((u'\n'.join(lines)).encode('utf-8')) | |
ebcf5a5e | 36 | |
37 |