Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix copy_files handling when generating .merlin files #2211

Merged
merged 2 commits into from
May 30, 2019
Merged

Fix copy_files handling when generating .merlin files #2211

merged 2 commits into from
May 30, 2019

Commits on May 30, 2019

  1. Add test case for bug 2206 

    Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
    @rgrinberg
    rgrinberg committed May 30, 2019
    Configuration menu
    Copy the full SHA
    a5fe41d View commit details
    Browse the repository at this point in the history

  2. Fix copy_files handling when generating .merlin files 

    Merlin generation would be broken in the presence of copy_files and any other
stanza with a preprocessing directive. This is because copy_files would have
No_preprocessing, and that would only successfully merge with non preprocessing
stanzas.

To fix the problem, we no longer rely on merging mechanism to add additional
directories for copy_files, the more_src_dirs argument aready exists for that.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
    @rgrinberg
    rgrinberg committed May 30, 2019
    Configuration menu
    Copy the full SHA
    634a73b View commit details
    Browse the repository at this point in the history