From b2857bb34e219f445053366cbfa6f371d0718639 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Tue, 12 May 2009 17:03:29 +0000
Subject: 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
---
 src/lib/Client/Tools/POSIX.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/lib/Client/Tools/POSIX.py')

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:
-- 
cgit v1.2.3-1-g7c22