diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-08-01 14:22:32 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-08-01 14:22:32 +0000 |
| commit | 867b093e26069de43268e424dc673d1242f6380d (patch) | |
| tree | a34227e283b174485738151dc543324286597b9f /src/lib/Server/Plugins/SSHbase.py | |
| parent | 27f130ee295c6469c74d172fe08ac310046c5d2c (diff) | |
| download | bcfg2-867b093e26069de43268e424dc673d1242f6380d.tar.gz bcfg2-867b093e26069de43268e424dc673d1242f6380d.tar.bz2 bcfg2-867b093e26069de43268e424dc673d1242f6380d.zip | |
Fix binary config file stats upload
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3589 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/SSHbase.py')
| -rw-r--r-- | src/lib/Server/Plugins/SSHbase.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index 3e468d91f..bc5375da6 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -181,11 +181,17 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): except OSError: self.logger.error("Failed to unlink temporary ssh keys") - def AcceptEntry(self, meta, _, entry_name, diff): + def AcceptEntry(self, meta, _, entry_name, diff, fulldata): '''per-plugin bcfg2-admin pull support''' filename = "%s/%s.H_%s" % (self.data, entry_name.split('/')[-1], meta.hostname) print "This file will be installed as file %s" % filename if raw_input("Should it be installed? (N/y): ") in 'Yy': - update_file(filename, diff) + print "writing file, %s" % filename + if fulldata: + newdata = fulldata + else: + newdata = '\n'.join(difflib.restore(diff.split('\n'), 1)) + open(filename, 'w').write(newdata) + |