calibre/calibre-manpages.patch

36 lines
1.3 KiB
Diff
Raw Normal View History

2012-02-02 00:20:04 +04:00
--- calibre/src/calibre/linux.py~ 2011-09-09 10:46:16.000000000 -0600
+++ calibre/src/calibre/linux.py 2011-09-13 12:41:50.307253773 -0600
@@ -318,7 +318,7 @@
2012-02-01 22:04:55 +04:00
continue
parser = parser()
raw = create_man_page(prog, parser)
2012-02-02 00:20:04 +04:00
- if isbsd:
+ if isbsd or islinux:
2012-02-01 22:04:55 +04:00
manfile = os.path.join(manpath, prog+'.1')
else:
manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
2012-02-02 00:20:04 +04:00
--- calibre/src/calibre/utils/help2man.py~ 2011-09-09 10:46:16.000000000 -0600
+++ calibre/src/calibre/utils/help2man.py 2011-09-13 12:45:17.056503626 -0600
@@ -4,7 +4,7 @@
2012-02-01 22:04:55 +04:00
__docformat__ = 'restructuredtext en'
import time, bz2
2012-02-02 00:20:04 +04:00
-from calibre.constants import isbsd
+from calibre.constants import isbsd, islinux
2012-02-01 22:04:55 +04:00
from calibre.constants import __version__, __appname__, __author__
2012-02-02 00:20:04 +04:00
@@ -58,9 +58,9 @@
2012-02-01 22:04:55 +04:00
lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
x in lines]
2012-02-02 00:20:04 +04:00
- if not isbsd:
2012-02-01 22:04:55 +04:00
- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
- else:
2012-02-02 00:20:04 +04:00
+ if isbsd or islinux:
2012-02-01 22:04:55 +04:00
return (u'\n'.join(lines)).encode('utf-8')
+ else:
+ return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
2012-02-02 00:20:04 +04:00