CI Train [cu2d]

Merge lp:~robru/cupstream2distro/fix-version-generation-for-reverts into lp:cupstream2distro

  1. fix-version-generation-for-reverts
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 1152
Merged at revision: 1152
Proposed branch: lp:~robru/cupstream2distro/fix-version-generation-for-reverts
Merge into: lp:cupstream2distro
Diff against target: 35 lines (+11/-2)
2 files modified
cupstream2distro/version.py (+3/-2)
tests/unit/test_version.py (+8/-0)
To merge this branch: bzr merge lp:~robru/cupstream2distro/fix-version-generation-for-reverts
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
CU2D maintainers Pending
Review via email: mp+274625@code.launchpad.net

Commit message

Fix incrementing versions after reverts.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1152
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/823/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/823/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cupstream2distro/version.py'
2--- cupstream2distro/version.py 2015-10-04 03:45:40 +0000
3+++ cupstream2distro/version.py 2015-10-15 19:47:37 +0000
4@@ -105,9 +105,10 @@
5 ubu = '-0ubuntu1' if 'ubuntu' in version else ''
6 if '+' not in version and 'ubuntu' not in version:
7 ubu = '-0ubuntu1'
8- base, div, tail = version.partition('-')
9+ base = version.partition('-')[0]
10+ base = base.partition('is.')[0]
11 base, div, date = base.partition('daily' if 'daily' in base else '+')
12- base, div, tail = base.partition('ubuntu')
13+ base = base.partition('ubuntu')[0]
14 rev, old_series = '', ''
15 match = SERIES_DATE.match(date)
16 if match:
17
18=== modified file 'tests/unit/test_version.py'
19--- tests/unit/test_version.py 2015-10-04 03:45:40 +0000
20+++ tests/unit/test_version.py 2015-10-15 19:47:37 +0000
21@@ -157,6 +157,14 @@
22 ('15.04+15.04.19841127', '15.04'),
23 '15.04+15.04.19841127.3':
24 ('15.04+15.04.19841127.2', '15.04'),
25+ '1+15.10.19841127.1-0ubuntu1':
26+ ('1+15.10.19841127.is.1+15.10.19841120-0ubuntu1', '15.10'),
27+ '2+15.10.19841127.1-0ubuntu1':
28+ ('2+15.10.19841127.~is.1+15.10.19841120-0ubuntu1', '15.10'),
29+ '3+15.10.19841127-0ubuntu1':
30+ ('3+15.10.19841126.is.1+15.10.19841120-0ubuntu1', '15.10'),
31+ '4+15.10.19841127-0ubuntu1':
32+ ('4+15.10.19841126.~is.1+15.10.19841120-0ubuntu1', '15.10'),
33 }
34 items = sorted(cases.items())
35 expected = [k for k, v in items]

Subscribers

People subscribed via source and target branches