merge to 0.4-1 (HEAD as of 2006-05-09

[mom.git] / swapmon.py

diff --git a/swapmon.py b/swapmon.py
index 3f6304e..907f72f 100755 (executable)
--- a/swapmon.py
+++ b/swapmon.py
@@ -9,7 +9,7 @@
 # Andy Bavier <acb@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: swapmon.py,v 1.4 2006/05/02 17:23:14 mlhuang Exp $
+# $Id: swapmon.py,v 1.5 2006/05/09 03:23:57 mlhuang Exp $
 #
 
 import syslog
@@ -349,7 +349,7 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
-        if version != "$Id: swapmon.py,v 1.4 2006/05/02 17:23:14 mlhuang Exp $":
+        if version != "$Id: swapmon.py,v 1.5 2006/05/09 03:23:57 mlhuang Exp $":
             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
 
@@ -366,7 +366,7 @@ def main():
         # Delete data file
         os.unlink(datafile)
     except Exception:
-        version = "$Id: swapmon.py,v 1.4 2006/05/02 17:23:14 mlhuang Exp $"
+        version = "$Id: swapmon.py,v 1.5 2006/05/09 03:23:57 mlhuang Exp $"
         slices = {}
 
     # Query process table every 30 seconds, or when a large change in