Remove git locks when starting mycroft #1715
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
MatthewScholefield
added
Type: Bug - complex
CLA: Yes
penrods
suggested changes
Aug 3, 2018
mycroft/skills/main.py
Outdated
| for i in glob(join(self.msm.skills_dir, '*/.git/index.lock')): | ||
| LOG.warning('Found and removed git lock file: ' + i) | ||
| os.remove(i) | ||
|
|
||
| def run(self): | ||
| """ Load skills and update periodically from disk and internet """ | ||
|
|
||
| # Load priority skills first, in order (very first time this will | ||
| # occur before MSM has run) |
There was a problem hiding this comment.
Let's clean this up -- the comment got left behind and makes absolutely no sense anymore. The code was originally this:
# Load priority skills first, in order (very first time this will
# occur before MSM has run)
self.load_skill_list(PRIORITY_SKILLS)So, that comment is no confusing, not helpful. Axe it.
Additionally, I think we need to explain the reasoning for the code that removes .git lock files. In the future, somebody is going to look at this and ask: "Why would someone do this? .git/index.lock is there for a reason!"
So add a comment that describes the reasoning behind the decision to override the locking mechanism.
This is a preventative measure to fix errors with git lock files not being removed when devices are unplugged or processes are killed
MatthewScholefield
force-pushed
the
bugfix/remove-git-locks
branch
from
f1573eb
to
51bd7ab
Compare
penrods
approved these changes
Aug 3, 2018
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.
Description
This is a preventative measure to fix errors with git lock files not being removed when devices are unplugged or processes are killed
How to test