[Python-checkins] CVS: distutils/distutils/command sdist.py,1.10,1.11

Greg Ward python-dev@python.org
Thu, 13 Apr 2000 20:49:33 -0400 (EDT)


Update of /projects/cvsroot/distutils/distutils/command
In directory kaluha:/tmp/cvs-serv27233

Modified Files:
	sdist.py 
Log Message:
Coerce all paths in the manifest template to the local path syntax with 
'native_path()'.

Index: sdist.py
===================================================================
RCS file: /projects/cvsroot/distutils/distutils/command/sdist.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sdist.py	2000/04/09 03:51:40	1.10
--- sdist.py	2000/04/14 00:49:30	1.11
***************
*** 5,9 ****
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.10 2000/04/09 03:51:40 gward Exp $"
  
  import sys, os, string, re
--- 5,9 ----
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.11 2000/04/14 00:49:30 gward Exp $"
  
  import sys, os, string, re
***************
*** 13,17 ****
  from distutils.core import Command
  from distutils.util import \
!      newer, remove_tree, make_tarball, make_zipfile, create_tree
  from distutils.text_file import TextFile
  from distutils.errors import DistutilsExecError
--- 13,17 ----
  from distutils.core import Command
  from distutils.util import \
!      newer, create_tree, remove_tree, make_tarball, make_zipfile, native_path
  from distutils.text_file import TextFile
  from distutils.errors import DistutilsExecError
***************
*** 318,322 ****
                      continue
  
!                 pattern = words[1]
  
              elif action in ('recursive-include','recursive-exclude'):
--- 318,322 ----
                      continue
  
!                 pattern = native_path (words[1])
  
              elif action in ('recursive-include','recursive-exclude'):
***************
*** 328,332 ****
                      continue
  
!                 (dir, pattern) = words[1:3]
  
              elif action in ('graft','prune'):
--- 328,332 ----
                      continue
  
!                 (dir, pattern) = map (native_path, words[1:3])
  
              elif action in ('graft','prune'):
***************
*** 338,342 ****
                      continue
  
!                 dir_pattern = words[1]
  
              else:
--- 338,342 ----
                      continue
  
!                 dir_pattern = native_path (words[1])
  
              else:
***************
*** 348,354 ****
              # right number of words on the line for that action -- so we
              # can proceed with minimal error-checking.  Also, we have
!             # defined either 'patter', 'dir' and 'pattern', or
!             # 'dir_pattern' -- so we don't have to spend any time digging
!             # stuff up out of 'words'.
  
              if action == 'include':
--- 348,354 ----
              # right number of words on the line for that action -- so we
              # can proceed with minimal error-checking.  Also, we have
!             # defined either (pattern), (dir and pattern), or
!             # (dir_pattern) -- so we don't have to spend any time
!             # digging stuff up out of 'words'.
  
              if action == 'include':