Renamed bundled pychm to recollchm to ease cohexistence with possible system version

This commit is contained in:
Jean-Francois Dockes
2018-06-12 19:29:37 +02:00
parent fd246d6744
commit 9bb50ccdd5
8 changed files with 12 additions and 16 deletions
+5 -10
View File
@@ -36,16 +36,11 @@ try:
# First try the system version if any
from chm import chm,chmlib
except:
for d in ('sys.path[0]', '/usr/lib/recoll', '/usr/local/lib/recoll'):
p = os.path.join(d, chmpackname)
if os.path.exists(p):
sys.path.append(p)
break
try:
from chm import chm,chmlib
except:
print("RECFILTERROR HELPERNOTFOUND python:chm")
sys.exit(1);
try:
from recollchm import chm,chmlib
except:
print("RECFILTERROR HELPERNOTFOUND python:chm")
sys.exit(1);
# Small helper routines
def getfile(chmfile, path):