summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-07-27 14:26:35 +0100
committerAndrew Bartlett <abartlet@samba.org>2018-09-27 01:54:27 +0200
commite8fec94827c933041acd5b447eeeefd0b7b507ef (patch)
tree9cc2387a033f07eb455d2b80fdab7a817a9d1a8e
parentcddd54e8654c94dedd57c08af1987ce03212ce20 (diff)
downloadsamba-e8fec94827c933041acd5b447eeeefd0b7b507ef.tar.gz
PY3: fix "TabError: inconsistent use of tabs and spaces"
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--auth/credentials/wscript_build10
-rw-r--r--buildtools/wafsamba/wscript2
-rw-r--r--examples/winexe/wscript20
-rw-r--r--source4/auth/wscript_build4
-rw-r--r--source4/heimdal/lib/wind/UnicodeData.py2
5 files changed, 19 insertions, 19 deletions
diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index 73e8e67947a..aaef541f57a 100644
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -28,8 +28,8 @@ for env in bld.gen_python_environments():
pytalloc_util = bld.pyembed_libname('pytalloc-util')
pyparam_util = bld.pyembed_libname('pyparam_util')
- bld.SAMBA_PYTHON('pycredentials',
- source='pycredentials.c',
- public_deps='samba-credentials cmdline-credentials %s %s CREDENTIALS_KRB5 CREDENTIALS_SECRETS' % (pytalloc_util, pyparam_util),
- realname='samba/credentials.so'
- )
+ bld.SAMBA_PYTHON('pycredentials',
+ source='pycredentials.c',
+ public_deps='samba-credentials cmdline-credentials %s %s CREDENTIALS_KRB5 CREDENTIALS_SECRETS' % (pytalloc_util, pyparam_util),
+ realname='samba/credentials.so'
+ )
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 0b73c85b6e6..5c4b037286b 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -560,7 +560,7 @@ struct foo bar = { .y = 'X', .x = 1 };
# Extra sanity check.
if conf.CONFIG_SET("HAVE_BIG_ENDIAN") == conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
Logs.error("Failed endian determination. The PDP-11 is back?")
- sys.exit(1)
+ sys.exit(1)
else:
if conf.CONFIG_SET("HAVE_BIG_ENDIAN"):
conf.DEFINE('WORDS_BIGENDIAN', 1)
diff --git a/examples/winexe/wscript b/examples/winexe/wscript
index 8e42f014da5..6b311b1da41 100644
--- a/examples/winexe/wscript
+++ b/examples/winexe/wscript
@@ -9,23 +9,23 @@ def configure(conf):
for a in AR32:
for t in TC:
- if conf.find_program(a + '-' + t + '-gcc', var='WINEXE_CC_WIN32'):
- found = True
- break
- if found:
+ if conf.find_program(a + '-' + t + '-gcc', var='WINEXE_CC_WIN32'):
+ found = True
+ break
+ if found:
conf.DEFINE('HAVE_WINEXE_CC_WIN32', 1);
- break
+ break
found = False
for a in AR64:
for t in TC:
- if conf.find_program(a + '-' + t + '-gcc', var='WINEXE_CC_WIN64'):
- found = True
- break
- if found:
+ if conf.find_program(a + '-' + t + '-gcc', var='WINEXE_CC_WIN64'):
+ found = True
+ break
+ if found:
conf.DEFINE('HAVE_WINEXE_CC_WIN64', 1);
- break
+ break
conf.DEFINE("WINEXE_LDFLAGS",
"-s -Wall -Wl,-Bstatic -Wl,-Bdynamic -luserenv")
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index d3452d2ca92..7d67c3dce5e 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -54,8 +54,8 @@ for env in bld.gen_python_environments():
pyparam_util = bld.pyembed_libname('pyparam_util')
pyldb_util = bld.pyembed_libname('pyldb-util')
pycredentials = 'pycredentials'
- if bld.env['IS_EXTRA_PYTHON']:
- pycredentials = 'extra-' + pycredentials
+ if bld.env['IS_EXTRA_PYTHON']:
+ pycredentials = 'extra-' + pycredentials
bld.SAMBA_PYTHON('pyauth',
source='pyauth.c',
public_deps='auth_system_session',
diff --git a/source4/heimdal/lib/wind/UnicodeData.py b/source4/heimdal/lib/wind/UnicodeData.py
index dd6dfa745d9..8ce3bcade27 100644
--- a/source4/heimdal/lib/wind/UnicodeData.py
+++ b/source4/heimdal/lib/wind/UnicodeData.py
@@ -50,7 +50,7 @@ def read(filename):
continue
f = l.split(';')
key = int(f[0], 0x10)
- if key in ret:
+ if key in ret:
raise Exception('Duplicate key in UnicodeData')
ret[key] = f[1:]
ud.close()