[SCM] morituri/master: * morituri/common/common.py: Since the version was inherited from the current code in unpickled objects, separate into classVersion and an instanceVersion set from __init__.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 10226d062d035da910ca524a436fc71634cfdc8d
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Mon May 25 14:49:36 2009 +0000

    	* morituri/common/common.py:
    	  Since the version was inherited from the current code
    	  in unpickled objects, separate into classVersion and
    	  an instanceVersion set from __init__.

diff --git a/ChangeLog b/ChangeLog
index b419fe3..c1c278d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-05-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/common.py:
+	  Since the version was inherited from the current code
+	  in unpickled objects, separate into classVersion and
+	  an instanceVersion set from __init__.
+
+2009-05-25  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/image/toc.py:
 	  Add a logName for debugging.
 
diff --git a/morituri/common/common.py b/morituri/common/common.py
index 3fea509..dac88bb 100644
--- a/morituri/common/common.py
+++ b/morituri/common/common.py
@@ -167,10 +167,9 @@ class PersistedCache(object):
         """
         persister = Persister(self._getPath(key))
         if persister.object:
-            if hasattr(persister.object, 'version'):
+            if hasattr(persister.object, 'instanceVersion'):
                 o = persister.object
-                if o.version < o.__class__.version:
-                    print 'object needs upgrade'
+                if o.instanceVersion < o.__class__.classVersion:
                     persister.delete()
 
         return persister

-- 
morituri packaging