sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

waf: fix parsing krb5-config --version for MIT krb5

Browse Source 
krb5-config --version may return a string that ends with a suffix after
version number (1.X-prerelease or 1.X-beta1, for example). Detect and
ignore the suffix.

Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Thu Jun  7 17:03:01 CEST 2012 on sn-devel-104
This commit is contained in:
Alexander Bokovoy 2012-06-07 14:22:33 +03:00
parent 23aac2039d
commit e1023501d9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wscript_configure_system_mitkrb5
View File

@ -37,9 +37,15 @@ if conf.env.KRB5_CONFIG:
conf.define('USING_SYSTEM_KRB5', 1)
del conf.env.HEIMDAL_KRB5_CONFIG
kversion = conf.cmd_and_log("%(path)s --version" % dict(path=conf.env.KRB5_CONFIG), dict()).strip()
kversion_split = map(int, kversion.split(" ")[-1].split("."))
if kversion_split < [1, 9]:
kversion_split = kversion.split(' ')[-1].split('.')
# drop '-prerelease' suffix
if kversion_split[-1].find('-') > 0:
last_digit = kversion_split[-1].split('-')[0]
kversion_split[-1] = last_digit
kversion_check = map(int, kversion_split)
if kversion_check < [1, 9]:
Logs.error('ERROR: MIT krb5 build requires at least 1.9.0. %s is found and cannot be used' % (kversion))
Logs.error('ERROR: You may try to build with embedded Heimdal Kerebros by not specifying --with-system-mitkrb5')
sys.exit(1)
else:
Logs.info('%s is detected, MIT krb5 build can proceed' % (kversion))