Sync charm-helpers
Change-Id: Ib93a16da251c359cfb19cd1119c9ca60cfbdc2f2
This commit is contained in:
parent
609631e658
commit
2c7836899d
|
@ -126,7 +126,7 @@ class CheckException(Exception):
|
|||
|
||||
|
||||
class Check(object):
|
||||
shortname_re = '[A-Za-z0-9-_.]+$'
|
||||
shortname_re = '[A-Za-z0-9-_.@]+$'
|
||||
service_template = ("""
|
||||
#---------------------------------------------------
|
||||
# This file is Juju managed
|
||||
|
|
|
@ -89,7 +89,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
|
|||
:param str source: URL pointing to an archive file.
|
||||
:param str dest: Local path location to download archive file to.
|
||||
"""
|
||||
# propogate all exceptions
|
||||
# propagate all exceptions
|
||||
# URLError, OSError, etc
|
||||
proto, netloc, path, params, query, fragment = urlparse(source)
|
||||
if proto in ('http', 'https'):
|
||||
|
|
Loading…
Reference in New Issue