summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-19 09:27:18 -0700
committerTom Rini <trini@ti.com>2012-11-19 09:27:18 -0700
commitbb367b95f9204115bd6eac82e839b5590e6da4eb (patch)
treea64a8fb6c7a86d79e9a4a0c32d48c033236815fb /tools
parentdb71964235c1dfa13ec398da483b0bdbbf31d5b7 (diff)
parent59ddead140a7cfda78bc36e22aadc48f3b962e59 (diff)
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/series.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py
index a283a2d1f4..d2971f4898 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -145,10 +145,11 @@ class Series(dict):
Return:
The change log as a list of strings, one per line
- Changes in v2:
+ Changes in v4:
- Jog the dial back closer to the widget
- Changes in v1:
+ Changes in v3: None
+ Changes in v2:
- Fix the widget
- Jog the dial
@@ -162,12 +163,16 @@ class Series(dict):
if commit and this_commit != commit:
continue
out.append(text)
- if out:
- out = ['Changes in v%d:' % change] + out
- if need_blank:
- out = [''] + out
- final += out
- need_blank = True
+ line = 'Changes in v%d:' % change
+ have_changes = len(out) > 0
+ if have_changes:
+ out.insert(0, line)
+ else:
+ out = [line + ' None']
+ if need_blank:
+ out.insert(0, '')
+ final += out
+ need_blank = have_changes
if self.changes:
final.append('')
return final