Juju Charms Collection
rabbitmq-server package

Merge lp:~james-page/charms/trusty/rabbitmq-server/vivid-fixes into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

  1. Trusty Tahr (14.04)
  2. vivid-fixes
  3. Merge into next
Proposed by James Page on 2015-04-22
Status: Merged
Merged at revision: 96
Proposed branch: lp:~james-page/charms/trusty/rabbitmq-server/vivid-fixes
Merge into: lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 20 lines (+9/-1)
1 file modified
hooks/rabbitmq_server_relations.py (+9/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/rabbitmq-server/vivid-fixes
Reviewer Review Type Date Requested Status
Liam Young 2015-04-22 Approve on 2015-04-22
Review via email: mp+257084@code.launchpad.net
To post a comment you must log in.
Liam Young (gnuoy) wrote :

Approve

review: Approve
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3802 rabbitmq-server-next for james-page mp257084
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3802/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3589 rabbitmq-server-next for james-page mp257084
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3589/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/rabbitmq_server_relations.py'
2--- hooks/rabbitmq_server_relations.py 2015-04-20 11:13:39 +0000
3+++ hooks/rabbitmq_server_relations.py 2015-04-22 13:17:02 +0000
4@@ -6,7 +6,15 @@
5 import subprocess
6 import glob
7 import socket
8-import yaml
9+
10+try:
11+ import yaml # flake8: noqa
12+except ImportError:
13+ if sys.version_info.major == 2:
14+ subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
15+ else:
16+ subprocess.check_call(['apt-get', 'install', '-y', 'python3-yaml'])
17+ import yaml # flake8: noqa
18
19 import rabbit_utils as rabbit
20 from lib.utils import (

Subscribers

People subscribed via source and target branches