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 #3210 -- Correctly handle separators for "ignored_assets" #3211

Merged
merged 2 commits into from Jan 23, 2019
Merged

Fix #3210 -- Correctly handle separators for "ignored_assets" #3211

merged 2 commits into from Jan 23, 2019

Conversation

@de-souza
Copy link
Contributor

@de-souza de-souza commented Jan 22, 2019

Pull Request Checklist

  • I’ve read the guidelines for contributing.
  • I updated AUTHORS.txt and CHANGES.txt (if the change is non-trivial) and documentation (if applicable).
  • I tested my changes.

Description

Fix Issue #3210 by normalizing the relative path to the convention of the operating system when parsing the theme meta file.

@@ -67,7 +67,7 @@ def gen_tasks(self):
theme_ini = utils.parse_theme_meta(main_theme)
if theme_ini:
ignored_assets = theme_ini.get("Nikola", "ignored_assets", fallback='').split(',')
ignored_assets = [asset_name.strip() for asset_name in ignored_assets]
ignored_assets = [os.path.normpath(asset_name).strip() for asset_name in ignored_assets]
Copy link
Member

@Kwpolska Kwpolska Jan 22, 2019

It might be better to call .strip before we call normpath.

@Kwpolska Kwpolska merged commit 0552489 into getnikola:master Jan 23, 2019
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants