From 8dae884cba115d4013d3038d8b97d6e840d48d88 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 31 Jan 2011 09:40:56 -0600 Subject: SSHbase: Fix hang when file not present on client Signed-off-by: Sol Jerome --- src/lib/Server/Plugins/SSHbase.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index 6d68ecb0a..96a444875 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -274,6 +274,10 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, # specific will always be host specific filename = "%s/%s.H_%s" % (self.data, entry['name'].split('/')[-1], specific.hostname) - open(filename, 'w').write(entry['text']) - if log: - print "Wrote file %s" % filename + try: + open(filename, 'w').write(entry['text']) + if log: + print "Wrote file %s" % filename + except KeyError: + self.logger.error("Failed to pull %s. This file does not currently " + "exist on the client" % entry.get('name')) -- cgit v1.2.3-1-g7c22