[Zope3-checkins] CVS: Zope3/src/zodb/zeo - server.py:1.6.4.4

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/zeo
In directory cvs.zope.org:/tmp/cvs-serv30018/zeo

Modified Files:
      Tag: opaque-pickles-branch
	server.py 
Log Message:
Remove conflict that wasn't noticed by pcl-cvs mode.


=== Zope3/src/zodb/zeo/server.py 1.6.4.3 => 1.6.4.4 ===
--- Zope3/src/zodb/zeo/server.py:1.6.4.3	Wed Mar 12 16:41:25 2003
+++ Zope3/src/zodb/zeo/server.py	Wed Mar 12 18:23:44 2003
@@ -746,19 +746,7 @@
             try:
                 s.close()
             except:
-<<<<<<< server.py
-                msg = "Couldn't pickle storage exception: %s" % repr(err)
-                self.logger.exception(msg)
-                err = StorageServerError(msg)
-            # The exception is reported back as newserial for this oid
-            newserial = err
-        else:
-            if serial != ZERO:
-                self.invalidated.append((oid, version))
-        self.serials.append((oid, newserial))
-=======
                 pass
->>>>>>> 1.7
 
     def close_conn(self, conn):
         """Internal: remove the given connection from self.connections.