Launchpad itself

Merge lp:~thumper/launchpad/recipe-default-version into lp:launchpad

  1. recipe-default-version
  2. Merge into devel
Proposed by Tim Penhey on 2010-11-23
Status: Merged
Approved by: Tim Penhey on 2010-11-24
Approved revision: no longer in the source branch.
Merged at revision: 11966
Proposed branch: lp:~thumper/launchpad/recipe-default-version
Merge into: lp:launchpad
Diff against target: 169 lines (+21/-19)
4 files modified
lib/canonical/buildd/test_buildd_recipe (+1/-1)
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+13/-13)
lib/lp/code/interfaces/sourcepackagerecipe.py (+1/-1)
lib/lp/code/model/tests/test_recipebuilder.py (+6/-4)
To merge this branch: bzr merge lp:~thumper/launchpad/recipe-default-version
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve on 2010-11-24
Review via email: mp+41663@code.launchpad.net

Commit Message

[r=thumper][ui=none][bug=652109] Update the default deb version to be {debupstream}-0~{revno}.

To post a comment you must log in.
Tim Penhey (thumper) wrote :

Very boring.

review: Approve
Aaron Bentley (abentley) wrote :

Boring it may be, but you introduced a lint error (too-long line).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/buildd/test_buildd_recipe'
2--- lib/canonical/buildd/test_buildd_recipe 2010-07-23 16:05:55 +0000
3+++ lib/canonical/buildd/test_buildd_recipe 2010-11-24 03:45:56 +0000
4@@ -8,7 +8,7 @@
5 country_code = 'us'
6 apt_cacher_ng_host = 'stumpy'
7 distroseries_name = 'maverick'
8-recipe_text = """# bzr-builder format 0.2 deb-version 0+{revno}
9+recipe_text = """# bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
10 http://bazaar.launchpad.dev/~ppa-user/+junk/wakeonlan"""
11
12 def deb_line(host, suites):
13
14=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
15--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-11-19 00:59:48 +0000
16+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-11-24 03:45:56 +0000
17@@ -135,13 +135,13 @@
18 Build schedule: Built daily
19 Owner: Master Chef
20 Base branch: lp://dev/~chef/ratatouille/veggies
21- Debian version: 0\+\{revno\}
22+ Debian version: {debupstream}-0~{revno}
23 Daily build archive: Secret PPA
24 Distribution series: Secret Squirrel
25 .*
26
27 Recipe contents
28- # bzr-builder format 0.2 deb-version 0\+\{revno\}
29+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
30 lp://dev/~chef/ratatouille/veggies"""
31 main_text = extract_text(find_main_content(browser.contents))
32 self.assertTextMatchesExpressionIgnoreWhitespace(
33@@ -291,7 +291,7 @@
34
35 browser = self.createRecipe(
36 dedent('''
37- # bzr-builder format 0.2 deb-version 0+{revno}
38+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
39 %(branch)s
40 merge %(package_branch)s
41 ''' % {
42@@ -345,7 +345,7 @@
43
44 with recipe_parser_newest_version(145.115):
45 recipe = dedent(u'''\
46- # bzr-builder format 145.115 deb-version 0+{revno}
47+ # bzr-builder format 145.115 deb-version {debupstream}-0~{revno}
48 %s
49 ''') % branch.bzr_identity
50 browser = self.createRecipe(recipe, branch)
51@@ -439,14 +439,14 @@
52 Build schedule: Built on request
53 Owner: Master Chef
54 Base branch: lp://dev/~chef/ratatouille/meat
55- Debian version: 0\+\{revno\}
56+ Debian version: {debupstream}-0~{revno}
57 Daily build archive:
58 PPA 2
59 Distribution series: Mumbly Midget
60 .*
61
62 Recipe contents
63- # bzr-builder format 0.2 deb-version 0\+\{revno\}
64+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
65 lp://dev/~chef/ratatouille/meat"""
66 main_text = extract_text(find_main_content(browser.contents))
67 self.assertTextMatchesExpressionIgnoreWhitespace(
68@@ -499,14 +499,14 @@
69 Build schedule: Built on request
70 Owner: Master Chef
71 Base branch: lp://dev/~chef/ratatouille/meat
72- Debian version: 0\+\{revno\}
73+ Debian version: {debupstream}-0~{revno}
74 Daily build archive:
75 Secret PPA
76 Distribution series: Mumbly Midget
77 .*
78
79 Recipe contents
80- # bzr-builder format 0.2 deb-version 0\+\{revno\}
81+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
82 lp://dev/~chef/ratatouille/meat"""
83 main_text = extract_text(find_main_content(browser.contents))
84 self.assertTextMatchesExpressionIgnoreWhitespace(
85@@ -551,7 +551,7 @@
86 distroseries=self.squirrel, branches=[veggie_branch])
87
88 new_recipe_text = dedent(u'''\
89- # bzr-builder format 145.115 deb-version 0+{revno}
90+ # bzr-builder format 145.115 deb-version {debupstream}-0~{revno}
91 %s
92 ''') % recipe.base_branch.bzr_identity
93
94@@ -639,14 +639,14 @@
95 Build schedule: Built on request
96 Owner: Master Chef
97 Base branch: lp://dev/~chef/ratatouille/meat
98- Debian version: 0\+\{revno\}
99+ Debian version: {debupstream}-0~{revno}
100 Daily build archive:
101 Secret PPA
102 Distribution series: Mumbly Midget
103 .*
104
105 Recipe contents
106- # bzr-builder format 0.2 deb-version 0\+\{revno\}
107+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
108 lp://dev/~chef/ratatouille/meat"""
109 main_text = extract_text(find_main_content(browser.contents))
110 self.assertTextMatchesExpressionIgnoreWhitespace(
111@@ -690,7 +690,7 @@
112 Build schedule: Built on request
113 Owner: Master Chef
114 Base branch: lp://dev/~chef/chocolate/cake
115- Debian version: 0\+\{revno\}
116+ Debian version: {debupstream}-0~{revno}
117 Daily build archive: Secret PPA
118 Distribution series: Secret Squirrel
119
120@@ -700,7 +700,7 @@
121 Request build\(s\)
122
123 Recipe contents
124- # bzr-builder format 0.2 deb-version 0\+\{revno\}
125+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
126 lp://dev/~chef/chocolate/cake""", self.getMainText(recipe))
127
128 def test_index_no_builds(self):
129
130=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
131--- lib/lp/code/interfaces/sourcepackagerecipe.py 2010-11-05 18:30:21 +0000
132+++ lib/lp/code/interfaces/sourcepackagerecipe.py 2010-11-24 03:45:56 +0000
133@@ -63,7 +63,7 @@
134
135
136 MINIMAL_RECIPE_TEXT = dedent(u'''\
137- # bzr-builder format 0.2 deb-version 0+{revno}
138+ # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}
139 %s
140 ''')
141
142
143=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
144--- lib/lp/code/model/tests/test_recipebuilder.py 2010-11-19 05:31:52 +0000
145+++ lib/lp/code/model/tests/test_recipebuilder.py 2010-11-24 03:45:56 +0000
146@@ -164,8 +164,9 @@
147 'author_name': u'Joe User',
148 'archive_purpose': 'PPA',
149 'ogrecomponent': 'universe',
150- 'recipe_text': '# bzr-builder format 0.2 deb-version 0+{revno}\n'
151- 'lp://dev/~joe/someapp/pkg\n',
152+ 'recipe_text':
153+ '# bzr-builder format 0.2 deb-version {debupstream}-0~{revno}\n'
154+ 'lp://dev/~joe/someapp/pkg\n',
155 'archives': expected_archives,
156 'distroseries_name': job.build.distroseries.name,
157 }, job._extraBuildArgs(distroarchseries))
158@@ -231,8 +232,9 @@
159 'author_name': u'Joe User',
160 'archive_purpose': 'PPA',
161 'ogrecomponent': 'universe',
162- 'recipe_text': '# bzr-builder format 0.2 deb-version 0+{revno}\n'
163- 'lp://dev/~joe/someapp/pkg\n',
164+ 'recipe_text':
165+ '# bzr-builder format 0.2 deb-version {debupstream}-0~{revno}\n'
166+ 'lp://dev/~joe/someapp/pkg\n',
167 'archives': expected_archives,
168 'distroseries_name': job.build.distroseries.name,
169 }, job._extraBuildArgs(distroarchseries, logger))