Juju Charms Collection
mongodb package

Merge lp:~james-page/charms/trusty/mongodb/pymongo-3.x into lp:charms/trusty/mongodb

  1. Trusty Tahr (14.04)
  2. pymongo-3.x
  3. Merge into trunk
Proposed by James Page on 2015-09-09
Status: Merged
Merged at revision: 77
Proposed branch: lp:~james-page/charms/trusty/mongodb/pymongo-3.x
Merge into: lp:charms/trusty/mongodb
Diff against target: 23 lines (+8/-2)
1 file modified
hooks/hooks.py (+8/-2)
To merge this branch: bzr merge lp:~james-page/charms/trusty/mongodb/pymongo-3.x
Reviewer Review Type Date Requested Status
Marco Ceppi 2015-09-09 Approve on 2015-09-30
Review via email: mp+270525@code.launchpad.net

Commit Message

Fix compatibility with later versions of pymongo.

To post a comment you must log in.
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9703 mongodb for james-page mp270525
    LINT OK: passed

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

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

charm_unit_test #8939 mongodb for james-page mp270525
    UNIT OK: passed

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

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

charm_amulet_test #6343 mongodb for james-page mp270525
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6343/

Ryan Beisner (1chb1n) wrote :

FYI, linked this proposal to bug 1500608.

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

charm_lint_check #10964 mongodb for james-page mp270525
    LINT OK: passed

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

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

charm_unit_test #10181 mongodb for james-page mp270525
    UNIT OK: passed

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

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

charm_amulet_test #6863 mongodb for james-page mp270525
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12607295/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6863/

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

charm_amulet_test #6878 mongodb for james-page mp270525
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6878/

Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2015-06-05 12:59:35 +0000
3+++ hooks/hooks.py 2015-09-09 13:00:13 +0000
4@@ -69,11 +69,17 @@
5 )
6
7 try:
8- from pymongo import Connection
9+ try:
10+ from pymongo import Connection
11+ except ImportError:
12+ from pymongo import MongoClient as Connection
13 from pymongo.errors import OperationFailure
14 except ImportError:
15 apt_install("python-pymongo", fatal=True)
16- from pymongo import Connection
17+ try:
18+ from pymongo import Connection
19+ except ImportError:
20+ from pymongo import MongoClient as Connection
21 from pymongo.errors import OperationFailure
22
23 try:

Subscribers

People subscribed via source and target branches

to all changes: