Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions github_scripts/merge_sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,23 @@ def main():
if not isinstance(opts, list):
opts = [opts]

# Clone the first provided source
values = opts.pop(0)
get_source(
values["source"],
values["ref"],
dest,
dependency,
args.mirrors,
args.mirror_loc,
)
# For all other sources, attempt to merge into the first
for values in opts:
for i, values in enumerate(opts):
if values["ref"] is None:
values["ref"] = ""

# Clone the first provided source
if i == 0:
get_source(
values["source"],
values["ref"],
dest,
dependency,
args.mirrors,
args.mirror_loc,
)
continue

# For all other sources, attempt to merge into the first
merge_source(
values["source"],
values["ref"],
Expand Down
28 changes: 16 additions & 12 deletions github_scripts/rose_stem_extract_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,22 @@ def main() -> None:
if not isinstance(opts, list):
opts = [opts]

# Clone the first provided source
values = opts.pop(0)
get_source(
values["source"],
values["ref"],
loc,
dependency,
use_mirrors,
mirror_loc,
)
# For all other sources, attempt to merge into the first
for values in opts:
for i, values in enumerate(opts):
if values["ref"] is None:
values["ref"] = ""

# Clone the first provided source
if i == 0:
get_source(
values["source"],
values["ref"],
loc,
dependency,
use_mirrors,
mirror_loc,
)
continue
# For all other sources, attempt to merge into the first
merge_source(
values["source"],
values["ref"],
Expand Down