Merge lp:~abentley/juju-release-tools/juju-version-field into lp:juju-release-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 287
Proposed branch: lp:~abentley/juju-release-tools/juju-version-field
Merge into: lp:juju-release-tools
Diff against target: 26 lines (+5/-2)
2 files modified
make_agent_json.py (+4/-2)
tests/test_make_agent_json.py (+1/-0)
To merge this branch: bzr merge lp:~abentley/juju-release-tools/juju-version-field
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+290900@code.launchpad.net

Commit message

Add juju-version to the juju-gui metadata.

Description of the change

This branch adds "juju-version" to the juju-gui metadata, per frankban's request.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Lovely. Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'make_agent_json.py'
2--- make_agent_json.py 2016-04-01 16:16:00 +0000
3+++ make_agent_json.py 2016-04-04 17:03:27 +0000
4@@ -203,8 +203,10 @@
5
6 The GUI is arch/os independent, so only one stanza is needed.
7 """
8- return [self.make_path_stanza(
9- 'com.canonical.streams:gui', self.version, hashes, size)]
10+ stanza = self.make_path_stanza(
11+ 'com.canonical.streams:gui', self.version, hashes, size)
12+ stanza['juju-version'] = 2
13+ return [stanza]
14
15
16 def main():
17
18=== modified file 'tests/test_make_agent_json.py'
19--- tests/test_make_agent_json.py 2016-04-01 16:16:00 +0000
20+++ tests/test_make_agent_json.py 2016-04-04 17:03:27 +0000
21@@ -183,4 +183,5 @@
22 'size': 314,
23 'format': 'products:1.0',
24 'product_name': 'com.canonical.streams:gui',
25+ 'juju-version': 2,
26 }, result)

Subscribers

People subscribed via source and target branches