(22329) Only delete hiera files in the preflight#149
Merged
haus merged 1 commit intopuppetlabs:masterfrom Aug 28, 2013
Merged
Conversation
Previously, the OSX preflight removed the contents of that ‘hiera’ directory, which also happens to be where the puppet.pkg places the contents of hiera_puppet. The fix is simple – from the hiera dir, only remove the files that exist in the ‘hiera’ project, not those in puppet. This commit accomplishes this by only deleting files, not the directories. It's a bit crufty, but its better than clobbering the wrong files. Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
haus
added a commit
that referenced
this pull request
Aug 28, 2013
…_preflight (22329) Only delete hiera files in the preflight
|
CLA signed by all contributors. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, the OSX preflight removed the contents of that ‘hiera’ directory,
which also happens to be where the puppet.pkg places the contents of
hiera_puppet. The fix is simple – from the hiera dir, only remove the files
that exist in the ‘hiera’ project, not those in puppet. This commit
accomplishes this by only deleting files, not the directories. It's a bit
crufty, but its better than clobbering the wrong files.
Signed-off-by: Moses Mendoza moses@puppetlabs.com