From b520577f971bd73edc77bb1af1fc8f9abdfb4bd2 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Wed, 6 Feb 2019 18:18:20 +0000 Subject: [PATCH] A few fixes for merge scripts after recent commits. --- bin/merge-all-kits | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/merge-all-kits b/bin/merge-all-kits index 562bad2c4..045412f84 100755 --- a/bin/merge-all-kits +++ b/bin/merge-all-kits @@ -223,7 +223,7 @@ async def updateKit(foundation, config, release, async_engine : AsyncMergeAllKit kit_name = kit_dict['name'] kit_branch = kit_dict['branch'] kit_root = "%s/%s" % (config.dest_trees, kit_dict['name']) - repo_config = mu.RepositoryConfig(kit_name, kit_branch, kit_root, config) + repo_config = mu.RepositoryConfig(kit_name, kit_root, kit_branch, config) # If we have gotten here, we are automatically generating a kit... kit_dict['tree'] = tree = mu.GitTree(kit_dict['name'], kit_dict['branch'], config=config, @@ -398,7 +398,7 @@ async def updateKit(foundation, config, release, async_engine : AsyncMergeAllKit # Phase 4: finalize and commit # remove unused licenses... - used_licenses = await mu.getAllLicenses(tree) + used_licenses = await mu.getAllLicenses(tree, repo_config=repo_config) to_remove = [] for license in os.listdir(tree.root + "/licenses"): if license not in used_licenses["dest_kit"]: