Skip to content

Commit 16172df

Browse files
committed
allow multiple providers in a single src. Would facilitate bazelbuild#238
1 parent c288b8d commit 16172df

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

pkg/private/pkg_files.bzl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ def process_src(content_map, src, origin, default_mode, default_user, default_gr
138138
Returns:
139139
True if src was a Package*Info and added to content_map.
140140
"""
141+
found_info = False
141142
if PackageFilesInfo in src:
142143
_process_pkg_files(
143144
content_map,
@@ -147,7 +148,8 @@ def process_src(content_map, src, origin, default_mode, default_user, default_gr
147148
default_user,
148149
default_group,
149150
)
150-
elif PackageFilegroupInfo in src:
151+
found_info = True
152+
if PackageFilegroupInfo in src:
151153
_process_pkg_filegroup(
152154
content_map,
153155
src[PackageFilegroupInfo],
@@ -156,7 +158,8 @@ def process_src(content_map, src, origin, default_mode, default_user, default_gr
156158
default_user,
157159
default_group,
158160
)
159-
elif PackageSymlinkInfo in src:
161+
found_info = True
162+
if PackageSymlinkInfo in src:
160163
_process_pkg_symlink(
161164
content_map,
162165
src[PackageSymlinkInfo],
@@ -165,7 +168,8 @@ def process_src(content_map, src, origin, default_mode, default_user, default_gr
165168
default_user,
166169
default_group,
167170
)
168-
elif PackageDirsInfo in src:
171+
found_info = True
172+
if PackageDirsInfo in src:
169173
_process_pkg_dirs(
170174
content_map,
171175
src[PackageDirsInfo],
@@ -174,9 +178,8 @@ def process_src(content_map, src, origin, default_mode, default_user, default_gr
174178
default_user,
175179
default_group,
176180
)
177-
else:
178-
return False
179-
return True
181+
found_info = True
182+
return found_info
180183

181184
def add_directory(content_map, dir_path, origin, mode=None, user=None, group=None):
182185
"""Add an single file to the content map.

0 commit comments

Comments
 (0)