From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Wu Date: Wed, 1 Apr 2015 10:54:43 +0800 Subject: [U-Boot] [ PATCH] patman: cover letter shows like 00/xx if more than 10 patches In-Reply-To: References: <1427766849-9422-1-git-send-email-josh.wu@atmel.com> Message-ID: <551B5DF3.1050303@atmel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, Simon On 4/1/2015 10:04 AM, Simon Glass wrote: > Hi Josh, > > On 30 March 2015 at 19:54, Josh Wu wrote: >> Make cover letter shows like 0/x, 00/xx and 000/xxx etc. >> >> Signed-off-by: Josh Wu >> --- > This is a quirk of patman that I've grown comfortable with. Still, we > should fix it. Thanks for the patch. > >> tools/patman/patchstream.py | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py >> index 8c3a0ec..4bfb1e9 100644 >> --- a/tools/patman/patchstream.py >> +++ b/tools/patman/patchstream.py >> @@ -468,8 +468,13 @@ def InsertCoverLetter(fname, series, count): >> prefix = series.GetPatchPrefix() >> for line in lines: >> if line.startswith('Subject:'): >> - # TODO: if more than 10 patches this should save 00/xx, not 0/xx >> - line = 'Subject: [%s 0/%d] %s\n' % (prefix, count, text[0]) >> + # if more than 10 patches this should save 00/xx, not 0/xx > s/save/say/ > > (my typo, I think) ;-) I'll fix this. > >> + zero_repeat = 1 >> + while (count / (10 ** zero_repeat) > 0): >> + zero_repeat = zero_repeat + 1 > How about: > > zero_repeat = int(math.log10(count)) + 1 > > ? yes, it's better. just need to import the match lib. I will change to this and sent v2 patch. Thanks. BTW: speak of patman, I get an issue of using the "Series-prefix". When I use Series-prefix like following in the commit: Series-prefix: U-Boot][ Then I get the patman generated patch like: [U-Boot][ PATCH] ^ a space here. A space is before the 'PATCH', that annoys me. But I don't see you have such space in your patches. Any advice to avoid the extra space? Thanks in advance. Best Regards, Josh Wu > >> + >> + zero = '0' * zero_repeat >> + line = 'Subject: [%s %s/%d] %s\n' % (prefix, zero, count, text[0]) >> >> # Insert our cover letter >> elif line.startswith('*** BLURB HERE ***'): >> -- >> 1.9.1 > Regards, > Simon