Commit bd8c400b authored by Daniel Smith's avatar Daniel Smith

fix patch list handling

parent 7665a0d3
...@@ -77,7 +77,7 @@ def parseArgs(): ...@@ -77,7 +77,7 @@ def parseArgs():
parser.add_argument("--SecondBuildOnHead", dest="secondBuildOnHead", action="store_true", help="Enable this parameter to build the second commit against branch HEAD instead of searching for a COIN integration.") parser.add_argument("--SecondBuildOnHead", dest="secondBuildOnHead", action="store_true", help="Enable this parameter to build the second commit against branch HEAD instead of searching for a COIN integration.")
parser.add_argument("--OpenGLBackend", dest="openGLBackend", type=str, default="desktop", help="Render backend options. Valid options are \'desktop\', \'angle\', \'software\'") parser.add_argument("--OpenGLBackend", dest="openGLBackend", type=str, default="desktop", help="Render backend options. Valid options are \'desktop\', \'angle\', \'software\'")
parser.add_argument("--jobName", dest="jobName", type=str, help="unique job name used for writing results file to logs directory. Typically a hash of the job to be run.") parser.add_argument("--jobName", dest="jobName", type=str, help="unique job name used for writing results file to logs directory. Typically a hash of the job to be run.")
parser.add_argument("--patches", dest="patches", type=list, help="List of patches to apply before building") parser.add_argument("--patches", dest="patches", type=str, help="List of patches to apply before building")
parser.add_argument("--environment", dest="environment", type=str, help="Comma separated list of environment variables and values to use for the build and test environment.") parser.add_argument("--environment", dest="environment", type=str, help="Comma separated list of environment variables and values to use for the build and test environment.")
return parser.parse_args() return parser.parse_args()
...@@ -658,8 +658,7 @@ def applyPatches(currentModule): ...@@ -658,8 +658,7 @@ def applyPatches(currentModule):
if not args.patches: if not args.patches:
return return
else: else:
for patch in args.patches.split(","):
for patch in [args.patches] if type(args.patches) is not list else args.patches:
url = "" url = ""
ref = patch ref = patch
module = "" module = ""
...@@ -1060,6 +1059,7 @@ def reportStatusUpdate(status_msg=""): ...@@ -1060,6 +1059,7 @@ def reportStatusUpdate(status_msg=""):
if __name__ == "__main__": if __name__ == "__main__":
atexit.register(on_exit) atexit.register(on_exit)
args = parseArgs() args = parseArgs()
print(args.patches, type(args.patches))
prepareEnv() prepareEnv()
initRepositories() initRepositories()
if not validateCommits() or not validateTest(): # Validate inputs! if not validateCommits() or not validateTest(): # Validate inputs!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment