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

Tighten up parsing of if-statement in default template #303

Merged
merged 1 commit into from
Feb 15, 2021

Conversation

erijo
Copy link
Contributor

@erijo erijo commented Jan 10, 2021

What does this PR do?

Require space after if and an ending %} after the condition.

What issues does this PR fix or reference?

None

Previous Behavior

{% ifyadm.class == "work" would be an accepted if statement.

New Behavior

Now it must be {% if yadm.class == "work" %}.

Have tests been written for this change?

No

Have these commits been signed with GnuPG?

Yes


Please review yadm's Contributing Guide for best practices.

Require space after if and an ending %} after the condition.
@TheLocehiliosan TheLocehiliosan self-assigned this Feb 15, 2021
@TheLocehiliosan TheLocehiliosan added this to In progress in 3.1.0 via automation Feb 15, 2021
@TheLocehiliosan
Copy link
Owner

This is a good catch...

@TheLocehiliosan TheLocehiliosan merged commit d11e094 into TheLocehiliosan:develop Feb 15, 2021
3.1.0 automation moved this from In progress to Done Feb 15, 2021
@erijo erijo deleted the default-template-if branch February 15, 2021 19:16
TheLocehiliosan added a commit that referenced this pull request Mar 22, 2021
* Use `git clone` directly during clone (#289, #323)
* Fix compatibility bug with Git completions (#318, #321)
* Support relative paths for --yadm-* and -w (#301)
* Improve parsing of if-statement in default template (#303)
* Read files without running cat in subshells (#317)
* Improve portability of updating read-only files (#320)
* Various code improvements (#306, #307, #311)
TheLocehiliosan added a commit that referenced this pull request Apr 3, 2021
* Use `git clone` directly during clone (#289, #323)
* Fix compatibility bug with Git completions (#318, #321)
* Support relative paths for --yadm-* and -w (#301)
* Improve parsing of if-statement in default template (#303)
* Read files without running cat in subshells (#317)
* Improve portability of updating read-only files (#320)
* Various code improvements (#306, #307, #311)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
3.1.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants