Merge branch 'master' of ssh://code.funtoo.org:7999/core/merge-scripts

funtoo · Feb 18, 2019 · e89c94a · e89c94a
2 parents ab2469a + b520577
commit e89c94a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"]: