Merge branch 'master' into rush_master

# Conflicts:
#	setup.py
This commit is contained in:
rusher
2019-11-06 15:46:31 +01:00
6 changed files with 41 additions and 18 deletions

View File

@ -31,14 +31,13 @@ def get_config():
connector_key = OpenKey(local_reg,
'SOFTWARE\\MariaDB Corporation\\MariaDB Connector C 64-bit',
access=KEY_READ | KEY_WOW64_64KEY)
cc_version = QueryValueEx(connector_key, "Version")
if cc_version[0] < required_version:
print(
"MariaDB Connector/Python requires MariaDB Connector/C >= %s (found version: %s") \
% (required_version, cc_version[0])
sys.exit(2)
cc_instdir = QueryValueEx(Key, "InstallDir")
cc_instdir = QueryValueEx(connector_key, "InstallDir")
except:
print("Could not find InstallationDir of MariaDB Connector/C. "