Sync charm-helpers

This commit is contained in:
Corey Bryant 2015-04-28 19:05:23 +00:00
parent ebb7757404
commit 6f685dcf7c

View File

@ -367,13 +367,15 @@ def install_remote(source, *args, **kwargs):
# explaining why it can't handle a given source.
handlers = [h for h in plugins() if h.can_handle(source) is True]
installed_to = None
for handler in handlers:
try:
installed_to = handler.install(source, *args, **kwargs)
except UnhandledSource:
pass
if not installed_to:
raise UnhandledSource("No handler found for source {}".format(source))
while not installed_to:
for handler in handlers:
try:
installed_to = handler.install(source, *args, **kwargs)
except UnhandledSource:
pass
log("CB: install loop - installed_to = |%s|".format(installed_to))
#if not installed_to:
# raise UnhandledSource("No handler found for source {}".format(source))
return installed_to