From 2c7836899d16c4ee832f2fef9f84f31c10a756f5 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 11 Jan 2019 14:35:07 +0000 Subject: [PATCH] Sync charm-helpers Change-Id: Ib93a16da251c359cfb19cd1119c9ca60cfbdc2f2 --- hooks/charmhelpers/contrib/charmsupport/nrpe.py | 2 +- hooks/charmhelpers/fetch/archiveurl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/charmhelpers/contrib/charmsupport/nrpe.py b/hooks/charmhelpers/contrib/charmsupport/nrpe.py index f59fdd6..0626b32 100644 --- a/hooks/charmhelpers/contrib/charmsupport/nrpe.py +++ b/hooks/charmhelpers/contrib/charmsupport/nrpe.py @@ -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 diff --git a/hooks/charmhelpers/fetch/archiveurl.py b/hooks/charmhelpers/fetch/archiveurl.py index dd24f9e..d25587a 100644 --- a/hooks/charmhelpers/fetch/archiveurl.py +++ b/hooks/charmhelpers/fetch/archiveurl.py @@ -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'):