Merge ~barryprice/postgresql-charm/+git/postgresql-charm:master into postgresql-charm:master

Proposed by Barry Price
Status: Merged
Approved by: 🤖 Canonical IS Review Bot
Approved revision: 826eee5a880a8984206f738cff956f2174bc7986
Merged at revision: de022a3abe414438b7b6ade2a59501d78e7136ed
Proposed branch: ~barryprice/postgresql-charm/+git/postgresql-charm:master
Merge into: postgresql-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/postgresql/service.py (+1/-1)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot Approve
Canonical IS Reviewers Pending
Review via email: mp+446383@code.launchpad.net

Commit message

Fix object syntax in data_dir error handling

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for axino

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision de022a3abe414438b7b6ade2a59501d78e7136ed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/postgresql/service.py b/reactive/postgresql/service.py
2index d1a7f62..70e166e 100644
3--- a/reactive/postgresql/service.py
4+++ b/reactive/postgresql/service.py
5@@ -73,7 +73,7 @@ def main():
6 elif os.path.exists(postgresql.data_dir()):
7 hookenv.status_set(
8 "blocked",
9- "PostgreSQL database from previous install found at {}".format(postgresql.postgresql.data_dir()),
10+ "PostgreSQL database from previous install found at {}".format(postgresql.data_dir()),
11 )
12 else:
13 hookenv.log("No pre-existing PostgreSQL database found")

Subscribers

People subscribed via source and target branches

to all changes: