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.

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

Fix git-submodule running in wrong location #23059

Merged
merged 1 commit into from
Feb 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/python/qmk/cli/git/submodule.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import shutil
from pathlib import Path

from milc import cli

from qmk.path import normpath
from qmk import submodules

REMOVE_DIRS = [
Expand Down Expand Up @@ -40,12 +40,12 @@ def git_submodule(cli):
remove_dirs = REMOVE_DIRS
if cli.config.git_submodule.force:
# Also trash everything that isnt marked as "safe"
for path in normpath('lib').iterdir():
for path in Path('lib').iterdir():
if not any(ignore in path.as_posix() for ignore in IGNORE_DIRS):
remove_dirs.append(path)

for folder in map(normpath, remove_dirs):
if normpath(folder).is_dir():
for folder in map(Path, remove_dirs):
if folder.is_dir():
print(f"Removing '{folder}'")
shutil.rmtree(folder)

Expand Down
Loading