[PATCH] fix tab space mixup in waf

Michael Adam obnox at samba.org
Tue Mar 3 06:33:01 MST 2015


Hi,

As it was pointed out to me by waf-upstream,
wafadmin uses tabs instead of spaces, and using
spaces might lead to incompatibilies later on
with newer python versions.

Now the recent openbsd fix uses spaces, which is
the one difference with the patch that has gone
upstream.

Attached find an addon-patch that changes the
spaces into tabs, redering us identical to upstream
again in that area.

Review/push appreciated.

Michael
-------------- next part --------------
From 692314da4a3f3f9fb0da645f9704763bb7a1278f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 3 Mar 2015 13:33:10 +0100
Subject: [PATCH] build:wafadmin: fix use of spaces instead of tabs.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 buildtools/wafadmin/Tools/ccroot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py
index 12ef442..cc690ec 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -184,9 +184,9 @@ def get_target_name(self):
 			# the import lib file name stays unversionned.
 			name = name + '-' + nums[0]
 		elif self.env.DEST_OS == 'openbsd':
-                        pattern = '%s.%s' % (pattern, nums[0])
-                        if len(nums) >= 2:
-                                pattern += '.%s' % nums[1]
+			pattern = '%s.%s' % (pattern, nums[0])
+			f len(nums) >= 2:
+				pattern += '.%s' % nums[1]
 
 	return os.path.join(dir, pattern % name)
 
-- 
2.1.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150303/6b6d2281/attachment.pgp>


More information about the samba-technical mailing list