Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against trying to use extend() with None

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-12-29 03:22:15 +00:00
parent b72899d142
commit 37df5cf045
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/tools/builder.py
View File

@@ -101,10 +101,12 @@ class Builder:
""" """
if self.isAvailable(): if self.isAvailable():
args = [self.getProgramPath()] args = [self.getProgramPath()]
args.extend(self.getProjectFileArg(projectFile)) pfArg = self.getProjectFileArg(projectFile)
if pfArg:
args.extend(pfArg)
args.append("clean") args.append("clean")
if options:
args.extend(options) args.extend(options)
result = runInDir(args, dir) result = runInDir(args, dir)
return result return result
@@ -117,11 +119,15 @@ class Builder:
def build(self, dir=None, projectFile=None, targets=None, options=[]): def build(self, dir=None, projectFile=None, targets=None, options=[]):
if self.isAvailable(): if self.isAvailable():
args = [self.getProgramPath()] args = [self.getProgramPath()]
args.extend(self.getProjectFileArg(projectFile)) pfArg = self.getProjectFileArg(projectFile)
if pfArg:
args.extend(pfArg)
# Important Note: if extending args, check it first!
# NoneTypes are not iterable and will crash the clean, build, or install!
# Very very irritating when this happens right at the end.
if options:
args.extend(options) args.extend(options)
result = runInDir(args, dir) result = runInDir(args, dir)
return result return result
return 1 return 1
@@ -129,14 +135,18 @@ class Builder:
def install(self, dir=None, projectFile=None, options=[]): def install(self, dir=None, projectFile=None, options=[]):
if self.isAvailable(): if self.isAvailable():
args = [self.getProgramPath()] args = [self.getProgramPath()]
args.extend(self.getProjectFileArg(projectFile)) pfArg = self.getProjectFileArg(projectFile)
if pfArg:
args.extend(pfArg)
args.append("install") args.append("install")
if options:
args.extend(options) args.extend(options)
result = runInDir(args, dir) result = runInDir(args, dir)
return result return result
return 1 return 1
# Concrete subclasses of abstract Builder interface # Concrete subclasses of abstract Builder interface
class GNUMakeBuilder(Builder): class GNUMakeBuilder(Builder):