[Zodb-checkins] CVS: ZODB3/ZODB - FileStorage.py:1.118

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv24914

Modified Files:
	FileStorage.py 
Log Message:
Do not raise exception for redundant pack.

And whitespace normalization.


=== ZODB3/ZODB/FileStorage.py 1.117 => 1.118 ===
--- ZODB3/ZODB/FileStorage.py:1.117	Tue Nov 26 17:48:43 2002
+++ ZODB3/ZODB/FileStorage.py	Mon Dec  2 17:45:49 2002
@@ -1356,9 +1356,9 @@
 
     def _redundant_pack(self, file, pos):
         assert pos > 8, pos
-        file.seek(pos-8)
-        p=U64(file.read(8))
-        file.seek(pos-p+8)
+        file.seek(pos - 8)
+        p = U64(file.read(8))
+        file.seek(pos - p + 8)
         return file.read(1) not in ' u'
 
     def pack(self, t, referencesf):
@@ -1410,9 +1410,7 @@
             if packpos == 4:
                 return
             if self._redundant_pack(file, packpos):
-                raise FileStorageError, (
-                    'The database has already been packed to a later time\n'
-                    'or no changes have been made since the last pack')
+                return
 
             rootl=[z64]
             pop=rootl.pop