Attachment 607 Details for Bug 1659 – calibre-manpages.patch

[patch] calibre-manpages.patch

calibre-manpages.patch (text/plain), 1.42 KB, created by Radu Cristian Fotescu on 2011-06-22 08:18:36 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Radu Cristian Fotescu

Created: 2011-06-22 08:18:36 CEST

Size: 1.42 KB

patch

obsolete

>diff -Nur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
>--- calibre.orig/src/calibre/linux.py	2011-05-27 10:42:14.000000000 -0600
>+++ calibre/src/calibre/linux.py	2011-05-27 20:06:53.461866793 -0600
>@@ -319,7 +319,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')
>diff -Nur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py
>--- calibre.orig/src/calibre/utils/help2man.py	2011-05-27 10:42:14.000000000 -0600
>+++ calibre/src/calibre/utils/help2man.py	2011-05-27 20:08:28.314256418 -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'))
> 
>

diff -Nur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
--- calibre.orig/src/calibre/linux.py	2011-05-27 10:42:14.000000000 -0600
+++ calibre/src/calibre/linux.py	2011-05-27 20:06:53.461866793 -0600
@@ -319,7 +319,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')
diff -Nur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py
--- calibre.orig/src/calibre/utils/help2man.py	2011-05-27 10:42:14.000000000 -0600
+++ calibre/src/calibre/utils/help2man.py	2011-05-27 20:08:28.314256418 -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'))

Actions: View | Diff

Attachments on bug 1659: 600 | 601 | 602 | 603 | 604 | 605 | 606 | 607 | 608