p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix rosmake for non-empty stacks (fix #4068)

This commit is contained in:
Dirk Thomas 2013-01-23 22:56:16 +00:00
parent 879f10a396
commit 4f6098f854
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/rosmake/src/rosmake/engine.py
View File

@ -761,14 +761,15 @@ class RosMakeAll:
required_packages = self.specified_packages[:] required_packages = self.specified_packages[:]
# catch dependent packages which are inside of zero sized stacks #3528 # catch packages of dependent stacks when specified stack is zero-sized #3528
# add them to required list but not the specified list. # add them to required list but not the specified list.
for s in stacks_arguments: for s in stacks_arguments:
for d in rosstack.get_depends(s, implicit=False): if not rosstack.packages_of(s):
try: for d in rosstack.get_depends(s, implicit=False):
required_packages.extend(rosstack.packages_of(d)) try:
except ResourceNotFound: required_packages.extend(rosstack.packages_of(d))
self.printer.print_all('WARNING: The stack "%s" was not found. We will assume it is using the new buildsystem and try to continue...' % d) except ResourceNotFound:
self.printer.print_all('WARNING: The stack "%s" was not found. We will assume it is using the new buildsystem and try to continue...' % d)
# deduplicate required_packages # deduplicate required_packages
required_packages = list(set(required_packages)) required_packages = list(set(required_packages))