[PATCH] fix tab space mixup in waf

Michael Adam obnox at samba.org
Tue Mar 3 09:34:15 MST 2015


On 2015-03-03 at 17:15 +0100, David Disseldorp wrote:
> On Tue, 3 Mar 2015 14:33:01 +0100, Michael Adam wrote:
> 
> > -                        pattern = '%s.%s' % (pattern, nums[0])
> > -                        if len(nums) >= 2:
> > -                                pattern += '.%s' % nums[1]
> > +			pattern = '%s.%s' % (pattern, nums[0])
> > +			f len(nums) >= 2:
> 
> Looks like you dropped an 'i'.

Gosh, thanks!

Update attached...
-------------- next part --------------
From e4724a200c231709d9a959dc35ef0042bbac1ded 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.

Indentation should not be a mixture of tabs and spaces.
Waf uses 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..25c5179 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])
+			if 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/37a1a8f0/attachment.pgp>


More information about the samba-technical mailing list