Juju Lint

Merge ~nikolay.vinogradov/juju-lint:master into juju-lint:master

  1. Git
  2. lp:~nikolay.vinogradov/juju-lint
  3. master
  4. Merge into master
Proposed by Nikolay Vinogradov
Status: Merged
Approved by: James Troup
Approved revision: c443a18b19b48b94fc68d949d37bed99cbce590b
Merged at revision: 01f138b0f9bf3ab3ad850761f23e0654467379f4
Proposed branch: ~nikolay.vinogradov/juju-lint:master
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+405002@code.launchpad.net

Commit message

Fix 1934197

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 Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 01f138b0f9bf3ab3ad850761f23e0654467379f4

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 f376640..bdd7008 100644
3--- a/jujulint/util.py
4+++ b/jujulint/util.py
5@@ -48,7 +48,7 @@ def is_container(machine):
6
7 def extract_charm_name(charm):
8 match = re.match(
9- r"^(?:\w+:)?(?:~[\w-]+/)?(?:\w+/)?([a-zA-Z0-9-]+?)(?:-\d+)?$", charm
10+ r"^(?:\w+:)?(?:~[\w\.-]+/)?(?:\w+/)?([a-zA-Z0-9-]+?)(?:-\d+)?$", charm
11 )
12 if not match:
13 raise InvalidCharmNameError(

Subscribers

People subscribed via source and target branches