Author: ritchiem
Date: Fri Oct 10 07:00:33 2008
New Revision: 703481
URL: http://svn.apache.org/viewvc?rev=703481&view=rev
Log:
QPID-1336 : Update the revisions for patches to print the svn revision
Modified:
incubator/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py
Modified: incubator/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py?rev=703481&r1=703480&r2=703481&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py (original)
+++ incubator/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py Fri Oct
10 07:00:33 2008
@@ -613,10 +613,12 @@
patchSource= _rootDir + PATH_SEP + PATCH_DIR + PATH_SEP + name
- for root, dirs, files in os.walk(patchSource, topdown=False):
+ for root, dirs, files in os.walk(patchSource):
+ if '.svn' in dirs:
+ dirs.remove('.svn')
for patchName in files:
- log("Applying patch '" + name + "' to " + source)
- runCommandShowError(basecommand + patchSource + PATH_SEP +
patchName)
+ log("Applying patch '" + name + "'("+patchName+") to "
+ source)
+ runCommandShowError(basecommand + patchSource +
PATH_SEP + patchName)
################################################################################
@@ -1042,8 +1044,10 @@
if (source.getElementsByTagName(REVISION).length > 0):
macro += "\n" + ECHO_BIN + " \"\t\tREVISION:"+ \
getValue(patch.getElementsByTagName(REVISION)[0]) + "\" >> " + filename
- else:
- macro += "\n" + ECHO_BIN + " \"\t\tREVISION: HEAD\" >>
"+ filename
+ else:
+ macro += "\n" + ECHO_BIN + " -n \"\t\tREVISION: \" >>
" + filename
+ macro += "\n" + SVNVERSION_BIN + " " + _rootDir +
PATH_SEP + PATCH_DIR + PATH_SEP + getName(patch) + " >> " + filename
+
if (patch.getElementsByTagName(PREFIX).length > 0):
macro += "\n" + ECHO_BIN + " \"\t\tPREFIX: " + \
