Merge ~arif-ali/juju-lint/+git/juju-lint:fix_container into juju-lint:master

Proposed by Arif Ali
Status: Merged
Approved by: James Troup
Approved revision: 84958ccde9484c3b06582482fcbe71f6ff6a01a6
Merged at revision: 050cad6a54a69f3cef08b8fb7c2a6bd046449454
Proposed branch: ~arif-ali/juju-lint/+git/juju-lint:fix_container
Merge into: juju-lint:master
Diff against target: 13 lines (+1/-1)
1 file modified
jujulint/util.py (+1/-1)
Reviewer Review Type Date Requested Status
Juju Lint maintainers Pending
Review via email: mp+383799@code.launchpad.net

Commit message

Fix is_container func

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
Arif Ali (arif-ali) wrote :

I have updated his MR based on the new codebase

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

Change successfully merged at revision 050cad6a54a69f3cef08b8fb7c2a6bd046449454

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jujulint/util.py b/jujulint/util.py
2index c646b28..2b7582a 100644
3--- a/jujulint/util.py
4+++ b/jujulint/util.py
5@@ -32,7 +32,7 @@ def flatten_list(lumpy_list):
6
7 def is_container(machine):
8 """Check if a provided machine is a container."""
9- if "/" in machine:
10+ if "lxd/" in machine:
11 return True
12 else:
13 return False

Subscribers

People subscribed via source and target branches