summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-08 11:11:32 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-08 00:55:13 +0000
commitc0297e5e89c48153a6f34f2585f9934bae2b2fbe (patch)
treea30243518ada15ed6570947f27bb28f91246107b
parentb867dc9ea204cfd449ba26f238f1fe733330fe75 (diff)
downloadsamba-c0297e5e89c48153a6f34f2585f9934bae2b2fbe.tar.gz
samba-c0297e5e89c48153a6f34f2585f9934bae2b2fbe.tar.bz2
samba-c0297e5e89c48153a6f34f2585f9934bae2b2fbe.zip
waf: fixed tabs/spaces for python3.0
Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Mon Nov 8 00:55:13 UTC 2010 on sn-devel-104
-rw-r--r--buildtools/wafsamba/samba_deps.py2
-rw-r--r--buildtools/wafsamba/samba_optimisation.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 60f2fa98cd..91737d5873 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -255,7 +255,7 @@ def check_duplicate_sources(bld, tgt_list):
for t in tgt_list:
source_list = TO_LIST(getattr(t, 'source', ''))
tpath = os.path.normpath(os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default'))
- obj_sources = set()
+ obj_sources = set()
for s in source_list:
p = os.path.normpath(os.path.join(tpath, s))
if p in obj_sources:
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index ad0534834f..951fd4c1f6 100644
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -154,12 +154,12 @@ def suncc_wrap(cls):
which have empty libs'''
if getattr(cls, 'solaris_wrap', False):
return
- cls.solaris_wrap = True
- oldrun = cls.run
- def run(self):
+ cls.solaris_wrap = True
+ oldrun = cls.run
+ def run(self):
if self.env.CC_NAME == "sun" and not self.inputs:
self.env = self.env.copy()
self.env.append_value('LINKFLAGS', '-')
return oldrun(self)
- cls.run = run
+ cls.run = run
suncc_wrap(Task.TaskBase.classes['cc_link'])