mirror of
https://abf.rosa.ru/djam/calibre.git
synced 2025-02-25 08:32:46 +00:00
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
--- 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 @@
|
|
continue
|
|
parser = parser()
|
|
raw = create_man_page(prog, parser)
|
|
- if isbsd:
|
|
+ if isbsd or islinux:
|
|
manfile = os.path.join(manpath, prog+'.1')
|
|
else:
|
|
manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
|
|
--- 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 @@
|
|
__docformat__ = 'restructuredtext en'
|
|
|
|
import time, bz2
|
|
-from calibre.constants import isbsd
|
|
+from calibre.constants import isbsd, islinux
|
|
|
|
from calibre.constants import __version__, __appname__, __author__
|
|
|
|
@@ -58,9 +58,9 @@
|
|
lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
|
|
x in lines]
|
|
|
|
- if not isbsd:
|
|
- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
|
|
- else:
|
|
+ if isbsd or islinux:
|
|
return (u'\n'.join(lines)).encode('utf-8')
|
|
+ else:
|
|
+ return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
|
|
|
|
|