Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow YAML config file to contain None #7779

Merged
merged 5 commits into from
Jul 3, 2020
Merged

Allow YAML config file to contain None #7779

merged 5 commits into from
Jul 3, 2020

Conversation

kotovalexarian
Copy link
Contributor

Useful when config file is fully commented. Otherwise we get error:

Traceback (most recent call last):
  File "/opt/matrix/synapse/venv/bin/synctl", line 380, in <module>
    main()
  File "/opt/matrix/synapse/venv/bin/synctl", line 244, in main
    config.update(yaml_config)
TypeError: 'NoneType' object is not iterable

Useful when config file is fully commented

Signed-off-by: Alex Kotov <kotovalexarian@gmail.com>
Signed-off-by: Alex Kotov <kotovalexarian@gmail.com>
changelog.d/7779.bugfix Outdated Show resolved Hide resolved
Signed-off-by: Alex Kotov <kotovalexarian@gmail.com>
changelog.d/7779.bugfix Outdated Show resolved Hide resolved
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

@richvdh richvdh merged commit 8097659 into matrix-org:develop Jul 3, 2020
@kotovalexarian kotovalexarian deleted the patch-1 branch July 4, 2020 04:40
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '5cdca53aa':
  Merge different Resource implementation classes (#7732)
  Fix inconsistent handling of upper and lower cases of email addresses. (#7021)
  Allow YAML config file to contain None (#7779)
  Fix a typo.
  Move 1.15.2 after 1.16.0rc2.
  1.16.0rc2
  Remove an extraneous space.
  Add links to the fixes.
  Fix tense in the release notes.
  Hack to add push priority to push notifications (#7765)
  Add early returns to `_check_for_soft_fail` (#7769)
  Use symbolic names for replication stream names (#7768)
  Type checking for `FederationHandler` (#7770)
  Fix new metric where we used ms instead of seconds (#7771)
  Fix incorrect error message when database CTYPE was set incorrectly. (#7760)
  Pin link in CHANGES.md
  Fixes to CHANGES.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants