From 71475199d9e6d6b435e9446e1636a0806edef2f9 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Mon, 3 Nov 2014 11:46:51 +1100
Subject: [PATCH] Formatting, typo, and speedup from RELEASE-3_2 compareSICS.py

---
 site_ansto/instrument/compareSICS.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/site_ansto/instrument/compareSICS.py b/site_ansto/instrument/compareSICS.py
index 927dcde7..d9fd0bac 100755
--- a/site_ansto/instrument/compareSICS.py
+++ b/site_ansto/instrument/compareSICS.py
@@ -119,7 +119,7 @@ def load_dir(theDir):
             if file.endswith((".swp", ".swo", ".hdf", "~", ".bck", ".pyc")):
                 continue
             if file.startswith(("core.", "SICServer")):
-                    continue
+                continue
             if not file in myDirs:
                 myDirs[file] = {}
             myDirs[file][root[theLen:]] = {}
@@ -184,7 +184,7 @@ if __name__ == "__main__":
         if key.endswith((".swp", ".swo", ".hdf", "~", ".bck", ".pyc")):
             continue
         if key.startswith(("core.", "SICServer")):
-                continue
+            continue
         for entry in sorted(gmap[key]):
             if entry.endswith(("/data", "/log")):
                 continue
@@ -202,7 +202,7 @@ if __name__ == "__main__":
         if key.endswith((".swp", ".swo", ".hdf", "~", ".bck", ".pyc")):
             continue
         if key.startswith(("core.", "SICServer")):
-                continue
+            continue
         for entry in sorted(gmap[key]):
             target = os.path.join(entry, key)
             #print "Looking in fmap for", os.path.join(entry, key)
@@ -219,7 +219,8 @@ if __name__ == "__main__":
                     if not os.path.exists(destin):
                         print "        ", destin, "does not exist"
                     continue
-                delta = list(difflib.unified_diff(\
+                if args.show:
+                    delta = list(difflib.unified_diff(\
                             open(source).read().splitlines(),\
                             open(destin).read().splitlines(),\
                             fromfile=source,\
@@ -227,6 +228,10 @@ if __name__ == "__main__":
                             fromfiledate=datetime.datetime.fromtimestamp(os.path.getmtime(source)),\
                             tofiledate=datetime.datetime.fromtimestamp(os.path.getmtime(destin)),\
                             lineterm=""))
+                elif open(source).read() == open(destin).read():
+                    delta = []
+                else:
+                    delta = [""]
                 delta_len = len(delta)
                 if delta_len > 0:
                     print_list[destin] = (source, list(delta))
@@ -240,7 +245,7 @@ if __name__ == "__main__":
             else:
                 print args.command, source, destin
         else:
-            print source, destin, "#%d" % len(delta)
+            print source, destin
             if args.show:
                 for line in delta:
                     print line
@@ -267,7 +272,7 @@ if __name__ == "__main__":
             if key.endswith((".swp", ".swo", ".hdf", "~", ".bck", ".pyc")):
                 continue
             if key.startswith(("core.", "SICServer")):
-                    continue
+                continue
             for entry in sorted(gmap[key]):
                 target = os.path.join(entry, key)
                 #print "Looking in fmap for", os.path.join(entry, key)
@@ -286,7 +291,7 @@ if __name__ == "__main__":
         if len(lines) > 0:
             tgt = "/tmp/link_%s" % str(os.getpid())
             if (os.path.exists(tgt)):
-                for root, disr, files in os.walk(tgt, topdown=False):
+                for root, dirs, files in os.walk(tgt, topdown=False):
                     for name in files:
                         os.remove(os.path.join(root, name))
                     for name in dirs:
@@ -327,7 +332,7 @@ if __name__ == "__main__":
             if key.endswith((".swp", ".swo", ".hdf", "~", ".bck", ".pyc")):
                 continue
             if key.startswith(("core.", "SICServer")):
-                    continue
+                continue
             for entry in sorted(gmap[key]):
                 target = os.path.join(entry, key)
                 #print "Looking in fmap for", os.path.join(entry, key)
@@ -378,5 +383,3 @@ if __name__ == "__main__":
                 except:
                     pass
             print "Copies (%d) in: %s" % (count, tgt)
-
-