[Python-checkins] CVS: distutils/distutils archive_util.py,1.3,1.4

Greg Ward python-dev@python.org
Tue, 30 May 2000 19:17:22 -0700


Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21229

Modified Files:
	archive_util.py 
Log Message:
Normalize paths before writing them to a zipfile.

Index: archive_util.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/archive_util.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** archive_util.py	2000/04/25 01:38:18	1.3
--- archive_util.py	2000/05/31 02:17:19	1.4
***************
*** 6,10 ****
  # created 2000/04/03, Greg Ward (extracted from util.py)
  
! __revision__ = "$Id: archive_util.py,v 1.3 2000/04/25 01:38:18 gward Exp $"
  
  import os
--- 6,10 ----
  # created 2000/04/03, Greg Ward (extracted from util.py)
  
! __revision__ = "$Id: archive_util.py,v 1.4 2000/05/31 02:17:19 gward Exp $"
  
  import os
***************
*** 94,98 ****
          def visit (z, dirname, names):
              for name in names:
!                 path = os.path.join (dirname, name)
                  if os.path.isfile (path):
                      z.write (path, path)
--- 94,98 ----
          def visit (z, dirname, names):
              for name in names:
!                 path = os.path.normpath(os.path.join(dirname, name))
                  if os.path.isfile (path):
                      z.write (path, path)