From 0a78354bd57893df9f926850aa736d6b434cd40b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 14 Aug 2010 19:38:44 -0600 Subject: [PATCH] Workaround for PyQt4/util-linux conflict on gentoo --- src/calibre/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 34801d39ca..16aaab73dd 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -3,7 +3,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import sys, os, re, logging, time, mimetypes, \ +import uuid, sys, os, re, logging, time, mimetypes, \ __builtin__, warnings, multiprocessing from urllib import getproxies __builtin__.__dict__['dynamic_property'] = lambda(func): func(None) @@ -23,6 +23,8 @@ from calibre.startup import winutil, winutilerror import mechanize +uuid.uuid4() # Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo + if False: winutil, winutilerror, __appname__, islinux, __version__ fcntl, win32event, isfrozen, __author__, terminal_controller