Delete symlink and active workdir on prune #39
Merged
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
smacker
reviewed
Jun 11, 2019
| @@ -134,7 +134,7 @@ func UnsetActive() error { | |||
| return err | |||
| } | |||
|
|
|||
| _, err = os.Stat(dir) | |||
| _, err = os.Lstat(dir) | |||
There was a problem hiding this comment.
could you explain why do you need to use Lstat here?
There was a problem hiding this comment.
sure!
from the PR description:
UnsetActivemust work withLstatto check symlink status,
instead of accessing the pointed dir.
From the function docs:
// UnsetActive removes symlink for active workdir
So let's consider:
__active__ -> ~/.sourced/workdirs/this/dir/was/deleted
Then os.Stat(dir) is going to return os.ErrNotExist (because it checks the pointed file, not the symlink itself), so os.Remove(dir) is not going to be called, so __active__ is not going to be deleted.
Using os.Lstat(dir) it will check the symlink itself (__active__), that exists, so it will be deleted as expected.
Bug fixed: prune command was deleting .env, docker-compose.yml and symlink, but not the active workdir itself. UnsetActive must work with Lstat to check symlink status, instead of accessing the pointed dir. Prune command must use the real workdir path, instead of the symlink route. Signed-off-by: David Pordomingo <[email protected]>
smacker
approved these changes
Jun 11, 2019
carlosms
approved these changes
Jun 11, 2019
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.
caused by #38
prunecommand was deleting.env,docker-compose.ymland__active__symlink,but not the active workdir itself.
UnsetActive must work with Lstat to check symlink status, instead of accessing the pointed dir.
Prune command must use the real workdir path, instead of the symlink route.