| Index: juju/hooks/scheduler.py |
| === modified file 'juju/hooks/scheduler.py' |
| --- juju/hooks/scheduler.py 2012-03-28 02:55:12 +0000 |
| +++ juju/hooks/scheduler.py 2012-03-30 02:46:54 +0000 |
| @@ -172,7 +172,7 @@ |
| class HookScheduler(object): |
| - def __init__(self, client, executor, unit_relation, relation_name, |
| + def __init__(self, client, executor, unit_relation, relation_ident, |
| unit_name, state_path): |
| self._running = False |
| self._state_path = state_path |
| @@ -182,7 +182,8 @@ |
| # For hook context construction. |
| self._client = client |
| self._unit_relation = unit_relation |
| - self._relation_name = relation_name |
| + self._relation_ident = relation_ident |
| + self._relation_name = relation_ident.split(":")[0] |
| self._unit_name = unit_name |
| self._current_clock = None |
| @@ -225,7 +226,7 @@ |
| """ |
| # Assemble the change and hook execution context |
| rel_change = RelationChange( |
| - self._relation_name, change['change_type'], change['unit_name']) |
| + self._relation_ident, change['change_type'], change['unit_name']) |
| context = RelationHookContext( |
| self._client, self._unit_relation, change, |
| change['members'], unit_name=self._unit_name) |
