Skip to content

Add overload to createMergedDigest to take a vector of trees

Jeremiah Bonney requested to merge jbonney/mergeMultipleTrees into master

Before raising this MR, consider whether the following are required, and complete if so:

  • Unit tests
  • Metrics
  • Documentation update(s)

If not required, please explain in brief why not.

Description

This MR aims to make MergeUtil::createMergedDigest more generic by supporting any number of DirectoryTrees to merge instead of just two. To specify more than two, you pass in a std::vector<DirectoryTree>, and then the trees are merged in the specified order.

The motivation behind this change is to change how buildbox-run-userchroot handles directory creation so that the output directories are made part of the input root before staging, instead of being made after the staging.

Edited by Jeremiah Bonney

Merge request reports