Merge pull request #150 from Mark-Simulacrum/support-empty-body

Support empty body text in a few more places
rust-lang · Aug 10, 2021 · ce13809 · ce13809
2 parents 2c82dc1 + 2910eb1
commit ce13809
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/homu/main.py b/homu/main.py
@@ -1605,7 +1605,7 @@ def synchronize(repo_label, repo_cfg, logger, gh, states, repos, db, mergeable_q
 
         state = PullReqState(pull.number, pull.head.sha, status, db, repo_label, mergeable_que, gh, repo_cfg['owner'], repo_cfg['name'], repo_cfg.get('labels', {}), repos, repo_cfg.get('test-on-fork'))  # noqa
         state.title = pull.title
-        state.body = suppress_pings(pull.body)
+        state.body = suppress_pings(pull.body or "")
         state.body = suppress_ignore_block(state.body)
         state.head_ref = pull.head.repo[0] + ':' + pull.head.ref
         state.base_ref = pull.base.ref

diff --git a/homu/server.py b/homu/server.py
@@ -318,7 +318,7 @@ def rollup(user_gh, state, repo_label, repo_cfg, repo):
             failures.append(state.num)
             continue
 
-        state.body = suppress_pings(state.body)
+        state.body = suppress_pings(state.body or "")
         state.body = suppress_ignore_block(state.body)
 
         merge_msg = 'Rollup merge of #{} - {}, r={}\n\n{}\n\n{}'.format(