Browse Source

Sync charm-helpers

Change-Id: Ib93a16da251c359cfb19cd1119c9ca60cfbdc2f2
changes/53/630253/1
Corey Bryant 4 months ago
parent
commit
2c7836899d

+ 1
- 1
hooks/charmhelpers/contrib/charmsupport/nrpe.py View File

@@ -126,7 +126,7 @@ class CheckException(Exception):
126 126
 
127 127
 
128 128
 class Check(object):
129
-    shortname_re = '[A-Za-z0-9-_.]+$'
129
+    shortname_re = '[A-Za-z0-9-_.@]+$'
130 130
     service_template = ("""
131 131
 #---------------------------------------------------
132 132
 # This file is Juju managed

+ 1
- 1
hooks/charmhelpers/fetch/archiveurl.py View File

@@ -89,7 +89,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
89 89
         :param str source: URL pointing to an archive file.
90 90
         :param str dest: Local path location to download archive file to.
91 91
         """
92
-        # propogate all exceptions
92
+        # propagate all exceptions
93 93
         # URLError, OSError, etc
94 94
         proto, netloc, path, params, query, fragment = urlparse(source)
95 95
         if proto in ('http', 'https'):

Loading…
Cancel
Save