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>
-import os
+import os, sys
from waflib import Utils, Context
import samba_utils
from samba_git import find_git
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