Juju Charms Collection
mysql package

Merge lp:~james-page/charms/precise/mysql/juju-core-compat into lp:charms/mysql

  1. Precise Pangolin (12.04)
  2. juju-core-compat
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 103
Proposed branch: lp:~james-page/charms/precise/mysql/juju-core-compat
Merge into: lp:charms/mysql
Diff against target: 13 lines (+2/-1)
1 file modified
hooks/shared_db_relations.py (+2/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/mysql/juju-core-compat
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+174953@code.launchpad.net

Description of the change

Minor fix for use with juju-core which behaves a little differently if relation-set is called with no params.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/shared_db_relations.py'
2--- hooks/shared_db_relations.py 2013-06-06 09:15:00 +0000
3+++ hooks/shared_db_relations.py 2013-07-16 09:26:26 +0000
4@@ -126,7 +126,8 @@
5 configure_db(databases[db]['hostname'],
6 databases[db]['database'],
7 databases[db]['username'])
8- utils.relation_set(**return_data)
9+ if len(return_data) > 0:
10+ utils.relation_set(**return_data)
11 if not cluster.is_clustered():
12 utils.relation_set(db_host=local_hostname)
13 else:

Subscribers

People subscribed via source and target branches

to all changes: