Author: robbie
Date: Tue Jan 5 11:45:23 2010
New Revision: 896004
URL: http://svn.apache.org/viewvc?rev=896004&view=rev
Log:
Fix UNZIP command usage, allow file based dependency URLs to be directories,
add debug logging of the release script following variable substitution, and
debug logging of its output after execution.
Modified:
qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py
Modified: qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py?rev=896004&r1=896003&r2=896004&view=diff
==============================================================================
--- qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py (original)
+++ qpid/trunk/qpid/buildtools/buildCreator/buildCreator.py Tue Jan 5 11:45:23
2010
@@ -538,7 +538,7 @@
extractcommand=TAR_BIN+" -vxjf "+root+PATH_SEP+file+"
-C " + builddir
if firstline.find(ZIP_DATA) != -1:
- extractcommand=ZIP_BIN+" -v "+root+PATH_SEP+file+" -d
"+ builddir
+ extractcommand=UNZIP_BIN+" -v "+root+PATH_SEP+file+" -d
"+ builddir
if firstline.find(TAR_DATA) != -1:
extractcommand=TAR_BIN+" -vxf "+root+PATH_SEP+file+" -C
"+ builddir
@@ -722,6 +722,8 @@
script = peformSubstitutionsInScript(build, script)
+ debug(script)
+
runScript(script)
else:
@@ -754,6 +756,12 @@
def runScript(script):
(returncode, stdout, stderr) = runCommandWithOutput(script)
+ if _debug:
+ for line in stdout:
+ debug(line)
+ for line in stderr:
+ debug(line)
+
if returncode != 0:
for line in stdout:
warn(line)
@@ -1144,7 +1152,7 @@
if url.startswith(FTP):
command = WGET_BIN+" -P "+targetdir+" "+url
else:
- command = CP_BIN+" "+url+" "+targetdir
+ command = CP_BIN+" -R "+url+" "+targetdir
else:
warn("Target directory(" + targetdir + ") is not empty please ensure
contents are valid or run 'clean "+name+"'")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
