tags 609557 + patch
user debian-...@lists.debian.org
usertag 609557 + kfreebsd
--
Hi,
please apply attached patch for now.
It would be very nice if you can inform upstream
about this problem. The support for multiple OSes
really needs cleanup:
./setup/__init__.py:isfreebsd = 'freebsd' in sys.platform
./setup/extensions.py:isunix = islinux or isosx or isfreebsd
./src/calibre/constants.py:isfreebsd = 'freebsd' in sys.platform.lower()
./src/calibre/constants.py:isunix = isosx or islinux
The GNU/kFreeBSD have the same kernel as plain FreeBSD,
but the same file system layout as linux.
Thanks in advance
Petr--- calibre-0.7.38+dfsg.orig/src/calibre/linux.py
+++ calibre-0.7.38+dfsg/src/calibre/linux.py
@@ -136,17 +136,17 @@ class PostInstall:
self.icon_resources = []
self.menu_resources = []
self.mime_resources = []
- if islinux:
+ if True or islinux:
self.setup_completion()
self.install_man_pages()
- if islinux:
+ if True or islinux:
self.setup_desktop_integration()
self.create_uninstaller()
from calibre.utils.config import config_dir
if os.path.exists(config_dir):
os.chdir(config_dir)
- if islinux:
+ if True or islinux:
for f in os.listdir('.'):
if os.stat(f).st_uid == 0:
os.rmdir(f) if os.path.isdir(f) else os.unlink(f)
--- calibre-0.7.38+dfsg.orig/src/calibre/devices/bambook/libbambookcore.py
+++ calibre-0.7.38+dfsg/src/calibre/devices/bambook/libbambookcore.py
@@ -31,9 +31,7 @@ except:
if iswindows:
text_encoding = 'mbcs'
-elif islinux:
- text_encoding = 'utf-8'
-elif isosx:
+else:
text_encoding = 'utf-8'
def is_bambook_lib_ready():
