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

buildtools/wafsamba: Finally fix reference to basestring PY3 error.

Browse Source 
While a previous attempt squashed the error on the config & make
phase, make install threw up this error again.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-09-27 11:39:44 +01:00 committed by Andrew Bartlett
parent 8c754b4396
commit 6400c8c695
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildtools/wafsamba/samba_version.py
View File

@ -1,4 +1,4 @@
import os
import os, sys
from waflib import Utils, Context
import samba_utils
from samba_git import find_git
@ -198,7 +198,10 @@ also accepted as dictionary entries here
for name in sorted(self.vcs_fields.keys()):
string+="#define SAMBA_VERSION_%s " % name
value = self.vcs_fields[name]
if isinstance(value, str) or isinstance(value, basestring):
string_types = str
if sys.version_info[0] < 3:
string_types = basestring
if isinstance(value, string_types):
string += "\"%s\"" % value
elif type(value) is int:
string += "%d" % value