summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-10-29 01:27:51 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-10-29 01:27:51 +0000
commit6723fcd16c761c09bcbe81cee0e3a859c30155a3 (patch)
tree9ee54b40864d0d75c05029ea56a7e420524c7f67
parent702dd06ee5ea8d655bf904249e16f8a309bb9d74 (diff)
downloadbcfg2-6723fcd16c761c09bcbe81cee0e3a859c30155a3.tar.gz
bcfg2-6723fcd16c761c09bcbe81cee0e3a859c30155a3.tar.bz2
bcfg2-6723fcd16c761c09bcbe81cee0e3a859c30155a3.zip
Cfg: Fix diff deltas (Patch from Thomas Schoenl)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5510 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Cfg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index 928a1dd06..249dd5548 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -25,7 +25,7 @@ def process_delta(data, delta):
if line[1:] in datalines:
datalines.remove(line[1:])
return "\n".join(datalines)
- elif delta.op == 'diff':
+ elif delta.specific.delta == 'diff':
basehandle, basename = tempfile.mkstemp()
basefile = open(basename, 'w')
basefile.write(data)