Merge ~lihuiguo/charm-nagios:application-dashboard into charm-nagios:master

Proposed by Linda Guo
Status: Merged
Approved by: James Troup
Approved revision: 07c917c371f8de06c2a0147afb13bc1daa44faa1
Merged at revision: 1b72935d5d1424ecb3a7a8166daa0893206d5b85
Proposed branch: ~lihuiguo/charm-nagios:application-dashboard
Merge into: charm-nagios:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/application_dashboard_relation.py (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+409880@code.launchpad.net

Commit message

Return empty string if JUJU_CHARM_DIR is not set because None+"/icon.svg" would raise exception

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
Canonical IS Mergebot (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 Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 1b72935d5d1424ecb3a7a8166daa0893206d5b85

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/application_dashboard_relation.py b/hooks/application_dashboard_relation.py
2index 54a9596..f404ef6 100755
3--- a/hooks/application_dashboard_relation.py
4+++ b/hooks/application_dashboard_relation.py
5@@ -49,7 +49,7 @@ def application_dashboard_relation_changed(relation_id=None, remote_unit=None):
6 else:
7 subtitle = "Monitoring and alerting"
8 group = "LMA"
9- icon_file = os.environ.get("JUJU_CHARM_DIR", None) + "/icon.svg"
10+ icon_file = os.environ.get("JUJU_CHARM_DIR", "") + "/icon.svg"
11 icon_data = None
12 if os.path.exists(icon_file):
13 with open(icon_file) as f:

Subscribers

People subscribed via source and target branches