summaryrefslogtreecommitdiffstats
path: root/src/lib/Client
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-10-15 03:32:47 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-10-15 03:32:47 +0000
commit3fec8ec4bd7c60b10685a2a911fd4a84c546b896 (patch)
tree02cdf3874bde235728f2a6da690e1bc2b4234a59 /src/lib/Client
parentc3d40a1bbcd6a5329998199eda10e406d19453c8 (diff)
downloadbcfg2-3fec8ec4bd7c60b10685a2a911fd4a84c546b896.tar.gz
bcfg2-3fec8ec4bd7c60b10685a2a911fd4a84c546b896.tar.bz2
bcfg2-3fec8ec4bd7c60b10685a2a911fd4a84c546b896.zip
* Automatically load the encap tool
* Use ndiff instead of unified diffs in POSIX * Add pull support to bcfg2-admin. This allows users to decide that a client is correct, and fix it entirely from the server side. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2435 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
-rw-r--r--src/lib/Client/Tools/POSIX.py2
-rw-r--r--src/lib/Client/Tools/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index 47ccb8e56..c6e76652e 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -191,7 +191,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
return False
contentStatus = content == tempdata
if not contentStatus:
- diff = '\n'.join([x for x in difflib.unified_diff(content.split('\n'), tempdata.split('\n'))])
+ diff = '\n'.join([x for x in difflib.ndiff(content.split('\n'), tempdata.split('\n'))])
try:
entry.set("current_diff", xml.sax.saxutils.quoteattr(diff))
except:
diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py
index e7934a4c7..3f58ffbc8 100644
--- a/src/lib/Client/Tools/__init__.py
+++ b/src/lib/Client/Tools/__init__.py
@@ -1,7 +1,7 @@
'''This contains all Bcfg2 Tool modules'''
__revision__ = '$Revision$'
-__all__ = ["APT", "Blast", "Chkconfig", "DebInit", "PostInstall",
+__all__ = ["APT", "Blast", "Chkconfig", "DebInit", "Encap", "PostInstall",
"POSIX", "RPM", "SMF", "SYSV"]
import os, popen2, stat, sys, Bcfg2.Client.XML