[Python-checkins] CVS: python/dist/src/Lib/distutils/command config.py,1.7,1.8

2001年8月16日 06:56:43 -0700

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv1293
Modified Files:
	config.py 
Log Message:
[Patch #442530 from twburton] 
 Provide include_dirs argument to all calls to ._preprocess and ._compile
 Fix typo: pattern.search(pattern) should be pattern.search(line)
Index: config.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/config.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** config.py	2001年08月13日 13:56:24	1.7
--- config.py	2001年08月16日 13:56:40	1.8
***************
*** 188,192 ****
 ok = 1
 try:
! self._preprocess(body, headers, lang)
 except CompileError:
 ok = 0
--- 188,192 ----
 ok = 1
 try:
! self._preprocess(body, headers, include_dirs, lang)
 except CompileError:
 ok = 0
***************
*** 206,210 ****

 self._check_compiler()
! (src, out) = self._preprocess(body, headers, lang)

 if type(pattern) is StringType:
--- 206,210 ----

 self._check_compiler()
! (src, out) = self._preprocess(body, headers, include_dirs, lang)

 if type(pattern) is StringType:
***************
*** 217,221 ****
 if line == '':
 break
! if pattern.search(pattern):
 match = 1
 break
--- 217,221 ----
 if line == '':
 break
! if pattern.search(line):
 match = 1
 break
***************
*** 232,236 ****
 self._check_compiler()
 try:
! self._compile(body, headers, lang)
 ok = 1
 except CompileError:
--- 232,236 ----
 self._check_compiler()
 try:
! self._compile(body, headers, include_dirs, lang)
 ok = 1
 except CompileError: