[Zope3-checkins] CVS: Zope3/src/zope/fssync - fsmerger.py:1.11

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv30035

Modified Files:
	fsmerger.py 
Log Message:
In merge_files(), when considering a sticky conflict, don't try to get
the mtime of the local file if the file doesn't exist; in that case,
always clear the conflict.


=== Zope3/src/zope/fssync/fsmerger.py 1.10 => 1.11 ===
--- Zope3/src/zope/fssync/fsmerger.py:1.10	Thu Jun  5 10:41:55 2003
+++ Zope3/src/zope/fssync/fsmerger.py	Tue Jun 10 15:12:07 2003
@@ -95,7 +95,8 @@
         # Reset sticky conflict if file was edited
         entry = self.metadata.getentry(local)
         conflict = entry.get("conflict")
-        if conflict and conflict != os.path.getmtime(local):
+        if conflict and (not os.path.exists(local) or
+                         conflict != os.path.getmtime(local)):
             del entry["conflict"]
 
         original = fsutil.getoriginal(local)