[Python-checkins] python/dist/src setup.py,1.163,1.164

montanaro@users.sourceforge.net montanaro@users.sourceforge.net
Tue, 06 May 2003 13:59:59 -0700


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28626a

Modified Files:
	setup.py 
Log Message:
p.strip(os.sep) can't have possibly worked.  It would have stripped both
leading and trailing '/' characters on Unix systems.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** setup.py	6 May 2003 20:43:34 -0000	1.163
--- setup.py	6 May 2003 20:59:57 -0000	1.164
***************
*** 60,65 ****
      for p in std_dirs:
          # Ensure path doesn't end with path separator
!         if p.endswith(os.sep):
!             p = p.strip(os.sep)
          if p == dirname:
              return [ ]
--- 60,64 ----
      for p in std_dirs:
          # Ensure path doesn't end with path separator
!         p = p.rstrip(os.sep)
          if p == dirname:
              return [ ]
***************
*** 69,74 ****
      for p in paths:
          # Ensure path doesn't end with path separator
!         if p.endswith(os.sep):
!             p = p.strip(os.sep)
          if p == dirname:
              return [p]
--- 68,72 ----
      for p in paths:
          # Ensure path doesn't end with path separator
!         p = p.rstrip(os.sep)
          if p == dirname:
              return [p]