[allura] branch dw/8460 updated (5180aa48a -> fd84695b1)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dill0wn pushed a change to branch dw/8460
in repository https://gitbox.apache.org/repos/asf/allura.git


 discard 5180aa48a fixup! fixup! fixup! [#8460] add new email @task which sends an already formatted email content
 discard 99fccd807 fixup! fixup! [#8460] add new email @task which sends an already formatted email content
 discard aa794076c fixup! [#8460] add new email @task which sends an already formatted email content
 discard 87bb912c6 [#8460] add new email @task which sends an already formatted email content
     new fd84695b1 [#8460] add new smtpclient method send_raw which sends pre-formatted email content

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5180aa48a)
            \
             N -- N -- N   refs/heads/dw/8460 (fd84695b1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[allura] 01/01: [#8460] add new smtpclient method send_raw which sends pre-formatted email content

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dill0wn pushed a commit to branch dw/8460
in repository https://gitbox.apache.org/repos/asf/allura.git

commit fd84695b1b5c34d69024bf0b1dadf9072dbf4235
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Wed Sep 7 14:37:47 2022 +0000

    [#8460] add new smtpclient method send_raw which sends pre-formatted email content
---
 Allura/allura/lib/mail_util.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index 374cb25ef..2caef5c26 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -301,11 +301,15 @@ class SMTPClient:
             log.warning('No valid addrs in %s, so not sending mail',
                         list(map(str, addrs)))
             return
+
+        self.send_raw(config.return_path, smtp_addrs, content)
+
+    def send_raw(self, addr_from, smtp_addrs, content):
         if not self._client:
             self._connect()
         try:
             self._client.sendmail(
-                config.return_path,
+                addr_from,
                 smtp_addrs,
                 content)
             need_retry = False
@@ -322,7 +326,7 @@ class SMTPClient:
             # maybe could sleep?  or if we're in a task, reschedule it somehow?
             self._connect()
             self._client.sendmail(
-                config.return_path,
+                addr_from,
                 smtp_addrs,
                 content)