[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - cvsloader.py:1.21

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv9140

Modified Files:
	cvsloader.py 
Log Message:
call normpath() sooner so everything agrees about where the CVS export
will show up


=== Packages/zpkgtools/zpkgtools/cvsloader.py 1.20 => 1.21 ===
--- Packages/zpkgtools/zpkgtools/cvsloader.py:1.20	Thu Apr 29 19:28:56 2004
+++ Packages/zpkgtools/zpkgtools/cvsloader.py	Fri Apr 30 13:35:48 2004
@@ -213,6 +213,7 @@
         cvsroot = cvsurl.getCvsRoot()
         tag = cvsurl.tag or "HEAD"
         path = cvsurl.path or "."
+        path = posixpath.normpath(path)
 
         rc = self.runCvsExport(cvsroot, workdir, tag, path)
         if rc:
@@ -231,7 +232,7 @@
         # cvs -f -Q -z6 -d CVSROOT export -kk -d WORKDIR -r TAG PATH
         # separated out from load() to ease testing the rest of load()
         # XXX not sure of a good way to test this method!
-        wf = posixpath.basename(posixpath.normpath(path))
+        wf = posixpath.basename(path)
         pwd = os.getcwd()
         os.chdir(workdir)
         cmdline = ("cvs", "-f", "-Q", "-z6", "-d", cvsroot,