diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py index 0379c0d839..684b33b80d 100644 --- a/setup/installer/linux/freeze2.py +++ b/setup/installer/linux/freeze2.py @@ -340,6 +340,8 @@ class LinuxFreeze(Command): __builtin__.help = _Helper() def set_qt_plugin_path(): + import uuid + uuid.uuid4() # Workaround for libuuid/PyQt conflict from PyQt4.Qt import QCoreApplication paths = list(map(unicode, QCoreApplication.libraryPaths())) paths.insert(0, sys.frozen_path + '/lib/qt_plugins') diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 096a02854f..a8cbe87e3e 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -21,7 +21,9 @@ from calibre.constants import iswindows, isosx, islinux, isfreebsd, isfrozen, \ filesystem_encoding, plugins, config_dir from calibre.startup import winutil, winutilerror, guess_type -uuid.uuid4() # Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo +if islinux and not getattr(sys, 'frozen', False): + # Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo + uuid.uuid4() if False: # Prevent pyflakes from complaining