summaryrefslogtreecommitdiffstats
path: root/src/lib/Client
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-05-12 17:03:29 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-05-12 17:03:29 +0000
commitb2857bb34e219f445053366cbfa6f371d0718639 (patch)
treedaddbef020b4e9771a61c4e29dcbbb7491ad8ccb /src/lib/Client
parent99b7eba28856d43d1c7a70551d0974e4a266e5f0 (diff)
downloadbcfg2-b2857bb34e219f445053366cbfa6f371d0718639.tar.gz
bcfg2-b2857bb34e219f445053366cbfa6f371d0718639.tar.bz2
bcfg2-b2857bb34e219f445053366cbfa6f371d0718639.zip
Display diff in interactive mode (for Ticket #526)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5221 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
-rw-r--r--src/lib/Client/Tools/POSIX.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index 1c7899ac8..e57ee96b6 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -274,7 +274,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
os.mkdir(entry.get('name'))
except OSError:
self.logger.error('Failed to create directory %s' % \
- (entry.get('name')))
+ (entry.get('name')))
return False
if entry.get('prune', 'false') == 'true' and entry.get("qtest"):
for pname in entry.get("qtest").split(":"):
@@ -301,7 +301,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
return True
except (OSError, KeyError):
self.logger.error('Permission fixup failed for %s' % \
- (entry.get('name')))
+ (entry.get('name')))
return False
def gatherCurrentData(self, entry):
@@ -338,7 +338,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
else:
if entry.text == None:
self.logger.error("Cannot verify incomplete ConfigFile %s" % \
- (entry.get('name')))
+ (entry.get('name')))
return False
tempdata = entry.text
if type(tempdata) == unicode:
@@ -346,11 +346,15 @@ class POSIX(Bcfg2.Client.Tools.Tool):
try:
content = open(entry.get('name')).read()
except IOError, error:
- self.logger.error("Failed to read %s: %s" % \
- (error.filename, error.strerror))
- return False
+ if error.strerror == "No such file or directory":
+ # print diff for files that don't exist (yet)
+ content = ''
+ else:
+ self.logger.error("Failed to read %s: %s" % \
+ (error.filename, error.strerror))
+ return False
# comparison should be done with fingerprints or
- # md5sum so it would be faster for big binary files
+ # md5sum so it would be faster for big binary files
contentStatus = content == tempdata
if not contentStatus:
if tbin or not isString(content):
@@ -367,11 +371,11 @@ class POSIX(Bcfg2.Client.Tools.Tool):
rawdiff.append(x)
if now - start > 5 and not longtime:
self.logger.info("Diff of %s taking a long time" % \
- (entry.get('name')))
+ (entry.get('name')))
longtime = True
elif now - start > 30:
self.logger.error("Diff of %s took too long; giving up" % \
- (entry.get('name')))
+ (entry.get('name')))
do_diff = False
break
if do_diff: