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

[Guido van Rossum]

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

Modified Files:
	fssync.py 
Log Message:
status() shouldn't print "?" for ignored files.


=== Zope3/src/zope/fssync/fssync.py 1.19 => 1.20 ===
--- Zope3/src/zope/fssync/fssync.py:1.19	Thu May 15 11:32:23 2003
+++ Zope3/src/zope/fssync/fssync.py	Thu May 15 11:41:42 2003
@@ -259,6 +259,7 @@
         self.metadata = metadata
         self.network = network
         self.network.setrooturl(rooturl)
+        self.fsmerger = FSMerger(self.metadata, self.reporter)
 
     def checkout(self, target):
         rootpath = self.network.rootpath
@@ -352,8 +353,7 @@
                 sts, output = commands.getstatusoutput(cmd)
                 if sts:
                     raise Error("unzip failed:\n%s" % output)
-                m = FSMerger(self.metadata, self.reporter)
-                m.merge(join(localdir, tail), join(tmpdir, tail))
+                self.fsmerger.merge(join(localdir, tail), join(tmpdir, tail))
                 self.metadata.flush()
                 print "All done."
             finally:
@@ -445,7 +445,8 @@
         flag = entry.get("flag")
         if isfile(target):
             if not entry:
-                print "?", target
+                if not self.fsmerger.ignore(target):
+                    print "?", target
             elif flag == "added":
                 print "A", target
             elif flag == "removed":
@@ -462,7 +463,7 @@
         elif isdir(target):
             pname = join(target, "")
             if not entry:
-                if not descend_only:
+                if not descend_only and not self.fsmerger.ignore(target):
                     print "?", pname
             elif flag == "added":
                 print "A", pname
@@ -486,7 +487,8 @@
                     self.status(join(target, namesdir[ncname]))
         elif exists(target):
             if not entry:
-                print "?", target
+                if not self.fsmerger.ignore(target):
+                    print "?", target
             elif flag:
                 print flag[0].upper() + "(unrecognized)", target
             else: