mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: Fix default function parameter assignment to a list

Browse Source 
With python you should not assign a list as the default value of a
function parameter - because a list is mutable, the result will be that
the first time a value is passed it will actually modify the default.
Reference:

http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments

(Bitbake rev: 7859f7388f2e3f675d0e1527cfde18625f36f637)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2015-08-17 12:12:16 +01:00
committed by Richard Purdie
parent 22a653d028
commit 715d857174
10 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bitbake/lib/bb/cooker.py
View File

@@ -114,12 +114,13 @@ class BBCooker:
Manages one bitbake build run
"""
def __init__(self, configuration, featureSet = []):
def __init__(self, configuration, featureSet=None):
self.recipecache = None
self.skiplist = {}
self.featureset = CookerFeatures()
for f in featureSet:
self.featureset.setFeature(f)
if featureSet:
for f in featureSet:
self.featureset.setFeature(f)
self.configuration = configuration
@@ -567,12 +568,14 @@ class BBCooker:
logger.plain("%-35s %25s %25s", p, lateststr, prefstr)
def showEnvironment(self, buildfile = None, pkgs_to_build = []):
def showEnvironment(self, buildfile=None, pkgs_to_build=None):
"""
Show the outer or per-recipe environment
"""
fn = None
envdata = None
if not pkgs_to_build:
pkgs_to_build = []
if buildfile:
# Parse the configuration here. We need to do it explicitly here since
@@ -1037,13 +1040,13 @@ class BBCooker:
return pkg_list
def generateTargetsTree(self, klass=None, pkgs=[]):
def generateTargetsTree(self, klass=None, pkgs=None):
"""
Generate a dependency tree of buildable targets
Generate an event with the result
"""
# if the caller hasn't specified a pkgs list default to universe
if not len(pkgs):
if not pkgs:
pkgs = ['universe']
# if inherited_class passed ensure all recipes which inherit the
# specified class are included in pkgs

4
bitbake/lib/bb/event.py
View File

@@ -176,7 +176,7 @@ def fire_from_worker(event, d):
fire_ui_handlers(event, d)
noop = lambda _: None
def register(name, handler, mask=[]):
def register(name, handler, mask=None):
"""Register an Event handler"""
# already registered
@@ -389,7 +389,7 @@ class DiskFull(Event):
class NoProvider(Event):
"""No Provider for an Event"""
def __init__(self, item, runtime=False, dependees=None, reasons=[], close_matches=[]):
def __init__(self, item, runtime=False, dependees=None, reasons=None, close_matches=None):
Event.__init__(self)
self._item = item
self._runtime = runtime

23
bitbake/lib/bb/fetch2/__init__.py
View File

@@ -777,7 +777,7 @@ def localpath(url, d):
fetcher = bb.fetch2.Fetch([url], d)
return fetcher.localpath(url)
def runfetchcmd(cmd, d, quiet = False, cleanup = []):
def runfetchcmd(cmd, d, quiet=False, cleanup=None):
"""
Run cmd returning the command output
Raise an error if interrupted or cmd fails
@@ -802,6 +802,9 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
'SSH_AUTH_SOCK', 'SSH_AGENT_PID',
'SOCKS5_USER', 'SOCKS5_PASSWD']
if not cleanup:
cleanup = []
for var in exportvars:
val = d.getVar(var, True)
if val:
@@ -1267,7 +1270,7 @@ class FetchData(object):
class FetchMethod(object):
"""Base class for 'fetch'ing data"""
def __init__(self, urls = []):
def __init__(self, urls=None):
self.urls = []
def supports(self, urldata, d):
@@ -1552,11 +1555,11 @@ class Fetch(object):
return local
def download(self, urls = []):
def download(self, urls=None):
"""
Fetch all urls
"""
if len(urls) == 0:
if not urls:
urls = self.urls
network = self.d.getVar("BB_NO_NETWORK", True)
@@ -1634,12 +1637,12 @@ class Fetch(object):
finally:
bb.utils.unlockfile(lf)
def checkstatus(self, urls = []):
def checkstatus(self, urls=None):
"""
Check all urls exist upstream
"""
if len(urls) == 0:
if not urls:
urls = self.urls
for u in urls:
@@ -1662,12 +1665,12 @@ class Fetch(object):
if not ret:
raise FetchError("URL %s doesn't work" % u, u)
def unpack(self, root, urls = []):
def unpack(self, root, urls=None):
"""
Check all urls exist upstream
"""
if len(urls) == 0:
if not urls:
urls = self.urls
for u in urls:
@@ -1685,12 +1688,12 @@ class Fetch(object):
if ud.lockfile:
bb.utils.unlockfile(lf)
def clean(self, urls = []):
def clean(self, urls=None):
"""
Clean files that the fetcher gets or places
"""
if len(urls) == 0:
if not urls:
urls = self.urls
for url in urls:

7
bitbake/lib/bb/msg.py
View File

@@ -150,7 +150,7 @@ loggerDefaultVerbose = False
loggerVerboseLogs = False
loggerDefaultDomains = []
def init_msgconfig(verbose, debug, debug_domains = []):
def init_msgconfig(verbose, debug, debug_domains=None):
"""
Set default verbosity and debug levels config the logger
"""
@@ -158,7 +158,10 @@ def init_msgconfig(verbose, debug, debug_domains = []):
bb.msg.loggerDefaultVerbose = verbose
if verbose:
bb.msg.loggerVerboseLogs = True
bb.msg.loggerDefaultDomains = debug_domains
if debug_domains:
bb.msg.loggerDefaultDomains = debug_domains
else:
bb.msg.loggerDefaultDomains = []
def constructLogOptions():
debug = loggerDefaultDebugLevel

5
bitbake/lib/bb/process.py
View File

@@ -128,10 +128,13 @@ def _logged_communicate(pipe, log, input, extrafiles):
pipe.stderr.close()
return ''.join(outdata), ''.join(errdata)
def run(cmd, input=None, log=None, extrafiles=[], **options):
def run(cmd, input=None, log=None, extrafiles=None, **options):
"""Convenience function to run a command and return its output, raising an
exception when the command fails"""
if not extrafiles:
extrafiles = []
if isinstance(cmd, basestring) and not "shell" in options:
options["shell"] = True

4
bitbake/lib/bb/server/process.py
View File

@@ -124,8 +124,10 @@ class ProcessServer(Process, BaseImplServer):
self.command_channel.close()
self.cooker.shutdown(True)
def idle_commands(self, delay, fds = []):
def idle_commands(self, delay, fds=None):
nextsleep = delay
if not fds:
fds = []
for function, data in self._idlefuns.items():
try:

7
bitbake/lib/bb/server/xmlrpc.py
View File

@@ -281,12 +281,15 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer):
self.connection_token = token
class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection):
def __init__(self, serverImpl, clientinfo=("localhost", 0), observer_only = False, featureset = []):
def __init__(self, serverImpl, clientinfo=("localhost", 0), observer_only = False, featureset = None):
self.connection, self.transport = _create_server(serverImpl.host, serverImpl.port)
self.clientinfo = clientinfo
self.serverImpl = serverImpl
self.observer_only = observer_only
self.featureset = featureset
if featureset:
self.featureset = featureset
else:
self.featureset = []
def connect(self, token = None):
if token is None:

8
bitbake/lib/bb/taskdata.py
View File

@@ -514,7 +514,7 @@ class TaskData:
self.add_runtime_target(fn, item)
self.add_tasks(fn, dataCache)
def fail_fnid(self, fnid, missing_list = []):
def fail_fnid(self, fnid, missing_list=None):
"""
Mark a file as failed (unbuildable)
Remove any references from build and runtime provider lists
@@ -523,6 +523,8 @@ class TaskData:
"""
if fnid in self.failed_fnids:
return
if not missing_list:
missing_list = []
logger.debug(1, "File '%s' is unbuildable, removing...", self.fn_index[fnid])
self.failed_fnids.append(fnid)
for target in self.build_targets:
@@ -536,7 +538,7 @@ class TaskData:
if len(self.run_targets[target]) == 0:
self.remove_runtarget(target, missing_list)
def remove_buildtarget(self, targetid, missing_list = []):
def remove_buildtarget(self, targetid, missing_list=None):
"""
Mark a build target as failed (unbuildable)
Trigger removal of any files that have this as a dependency
@@ -561,7 +563,7 @@ class TaskData:
logger.error("Required build target '%s' has no buildable providers.\nMissing or unbuildable dependency chain was: %s", target, missing_list)
raise bb.providers.NoProvider(target)
def remove_runtarget(self, targetid, missing_list = []):
def remove_runtarget(self, targetid, missing_list=None):
"""
Mark a run target as failed (unbuildable)
Trigger removal of any files that have this as a dependency

12
bitbake/lib/bb/ui/crumbs/hobeventhandler.py
View File

@@ -440,11 +440,17 @@ class HobHandler(gobject.GObject):
self.commands_async.append(self.SUB_BUILD_RECIPES)
self.run_next_command(self.GENERATE_PACKAGES)
def generate_image(self, image, base_image, image_packages=[], toolchain_packages=[], default_task="build"):
def generate_image(self, image, base_image, image_packages=None, toolchain_packages=None, default_task="build"):
self.image = image
self.base_image = base_image
self.package_queue = image_packages
self.toolchain_packages = toolchain_packages
if image_packages:
self.package_queue = image_packages
else:
self.package_queue = []
if toolchain_packages:
self.toolchain_packages = toolchain_packages
else:
self.toolchain_packages = []
self.default_task = default_task
self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
self.commands_async.append(self.SUB_PARSE_CONFIG)

4
bitbake/lib/toaster/toastergui/views.py
View File

@@ -522,7 +522,9 @@ def builddashboard( request, build_id ):
def generateCoveredList2( revlist = [] ):
def generateCoveredList2( revlist = None ):
if not revlist:
revlist = []
covered_list = [ x for x in revlist if x.outcome == Task.OUTCOME_COVERED ]
while len(covered_list):
revlist = [ x for x in revlist if x.outcome != Task.OUTCOME_COVERED ]