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 |
Related bugs: |
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'.
To post a comment you must log in.
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 jobs/lp. py' jobs/lp. py 2013-10-17 20:19:55 +0000 jobs/lp. py 2013-10-23 21:53:17 +0000
charm_ copy['branch_ spec'],
charm_ copy['store_ data'][ 'revision' ]) payloads( baskets, import_filter): 'branch_ deleted' ] = False queue.put( basket)
log.info( 'Queueing bundle %s', basket[ 'branch_ spec'])
=== modified file 'charmworld/
--- charmworld/
+++ charmworld/
@@ -140,6 +140,7 @@
for basket in _filtered_
+ basket[
added = basket_
if added:
Index: charmworld/ jobs/tests/ test_lp. py jobs/tests/ test_lp. py' jobs/tests/ test_lp. py 2013-10-17 20:19:55 +0000 jobs/tests/ test_lp. py 2013-10-23 21:53:17 +0000 PAYLOAD = {
'branch_ spec': '~baz/bar/ 1/bundle' ,
=== modified file 'charmworld/
--- charmworld/
+++ charmworld/
@@ -296,6 +296,7 @@
BASKET_
'foo': 'bar',
+ 'branch_deleted': False,
}
def setUp(self):