[WIP] Added clean_top argument for the archive state #54013
Closed
Conversation
This file contains 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
|
Folks, could you please look at the mentioned issue and in my implementation of this feature and tell if it's ok(both issue and implementation). If it's ok for you I'll write tests(not yet sure how) |
Oloremo
force-pushed
the
added_clean_top_for_archive
branch
from
831d955 to
b63d87b
Compare
ghost
requested a review
from 
twangboy
requested changes
Jul 26, 2019
| @@ -526,6 +527,9 @@ def extracted(name, | |||
|
|
|||
| .. versionadded:: 2016.11.1 | |||
|
|
|||
| clean_top : False | |||
| Set this to ``True`` to remove a top level directory before the extration. | |||
| errors = [] | ||
| log.debug('Removing directory %s due to clean_top set to True', name) | ||
| try: | ||
| salt.utils.files.rm_rf(name.rstrip(os.sep)) |
There was a problem hiding this comment.
Maybe rename the directory, if the archive.extract is successful, then delete, otherwise roll it back
There was a problem hiding this comment.
I'm not sure here.
First of all, it adds complexity + a hidden requirement for a 2x space(to keep both old and new dir at some point of time).
Second is that the current clean: True logic doesn't do it and I feel like it's more or less the same case.
|
Closed in favor of #55418 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Adding new argument
clean_topto the archive state. This allows the state to remove top level directory before the extraction.What issues does this PR fix or reference?
#54012
Previous Behavior
archive state was unable to do so by itself.
New Behavior
archive state now able to remove top level directory if requested
Tests written?
No(yet) - RFC required first
Commits signed with GPG?
Yes