sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Handle extra spaces in merge-svc-map-files"

Browse Source
This commit is contained in:
Jenkins 2014-10-24 07:42:02 +00:00 committed by Gerrit Code Review
commit 9d252ba318
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/svc-map/extra-data.d/10-merge-svc-map-files
View File

@ -48,6 +48,8 @@ def main():
element_paths = os.environ.get("ELEMENTS_PATH").split(':') element_paths = os.environ.get("ELEMENTS_PATH").split(':')
service_names = dict() service_names = dict()
for element in elements: for element in elements:
if not element.strip():
continue
for element_path in element_paths: for element_path in element_paths:
data_path = os.path.join(element_path, element, "svc-map") data_path = os.path.join(element_path, element, "svc-map")
if os.path.exists(data_path): if os.path.exists(data_path):