Merge lp:~bac/charmworld/fix-bundle-branch-delete-key into lp:~juju-jitsu/charmworld/trunk

Proposed by Brad Crittenden
Status: Merged
Merged at revision: 428
Proposed branch: lp:~bac/charmworld/fix-bundle-branch-delete-key
Merge into: lp:~juju-jitsu/charmworld/trunk
Diff against target: 23 lines (+2/-0)
2 files modified
charmworld/jobs/lp.py (+1/-0)
charmworld/jobs/tests/test_lp.py (+1/-0)
To merge this branch: bzr merge lp:~bac/charmworld/fix-bundle-branch-delete-key
Reviewer Review Type Date Requested Status
Juju-Jitsu Hackers Pending
Review via email: mp+192409@code.launchpad.net

Description of the change

Fix ingest KeyError for 'branch_deleted'.

https://codereview.appspot.com/16240044/

To post a comment you must log in.
Brad Crittenden (bac) wrote :

Reviewers: mp+192409_code.launchpad.net,

Message:
Please take a look.

Description:
Fix ingest KeyError for 'branch_deleted'.

https://code.launchpad.net/~bac/charmworld/show-bundle-changes/+merge/192409

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/16240044/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: charmworld/jobs/lp.py
=== modified file 'charmworld/jobs/lp.py'
--- charmworld/jobs/lp.py 2013-10-17 20:19:55 +0000
+++ charmworld/jobs/lp.py 2013-10-23 21:53:17 +0000
@@ -140,6 +140,7 @@
                           charm_copy['branch_spec'],
                           charm_copy['store_data']['revision'])
      for basket in _filtered_payloads(baskets, import_filter):
+ basket['branch_deleted'] = False
          added = basket_queue.put(basket)
          if added:
              log.info('Queueing bundle %s', basket['branch_spec'])

Index: charmworld/jobs/tests/test_lp.py
=== modified file 'charmworld/jobs/tests/test_lp.py'
--- charmworld/jobs/tests/test_lp.py 2013-10-17 20:19:55 +0000
+++ charmworld/jobs/tests/test_lp.py 2013-10-23 21:53:17 +0000
@@ -296,6 +296,7 @@
      BASKET_PAYLOAD = {
          'foo': 'bar',
          'branch_spec': '~baz/bar/1/bundle',
+ 'branch_deleted': False,
      }

      def setUp(self):

Brad Crittenden (bac) wrote :

*** Submitted:

Fix ingest KeyError for 'branch_deleted'.

R=
CC=
https://codereview.appspot.com/16240044

https://codereview.appspot.com/16240044/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmworld/jobs/lp.py'
2--- charmworld/jobs/lp.py 2013-10-17 20:19:55 +0000
3+++ charmworld/jobs/lp.py 2013-10-23 21:56:14 +0000
4@@ -140,6 +140,7 @@
5 charm_copy['branch_spec'],
6 charm_copy['store_data']['revision'])
7 for basket in _filtered_payloads(baskets, import_filter):
8+ basket['branch_deleted'] = False
9 added = basket_queue.put(basket)
10 if added:
11 log.info('Queueing bundle %s', basket['branch_spec'])
12
13=== modified file 'charmworld/jobs/tests/test_lp.py'
14--- charmworld/jobs/tests/test_lp.py 2013-10-17 20:19:55 +0000
15+++ charmworld/jobs/tests/test_lp.py 2013-10-23 21:56:14 +0000
16@@ -296,6 +296,7 @@
17 BASKET_PAYLOAD = {
18 'foo': 'bar',
19 'branch_spec': '~baz/bar/1/bundle',
20+ 'branch_deleted': False,
21 }
22
23 def setUp(self):

Subscribers

People subscribed via source and target branches