diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
| commit | ca9e5e41f43a8430f4b282bfddf2dcf3ba2c3d7c (patch) | |
| tree | d662eaaec049edd26bda8091b31c22edc340e18a /packages | |
| parent | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (diff) | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
Merge commit '91c451'
Conflicts:
devel/views.py
feeds.py
local_settings.py.example
packages/management/commands/signoff_report.py
packages/views/flag.py
public/views.py
templates/404.html
templates/base.html
templates/devel/clock.html
templates/devel/index.html
templates/devel/packages.html
templates/devel/profile.html
templates/general_form.html
templates/mirrors/mirror_details.html
templates/mirrors/mirrorlist.txt
templates/mirrors/mirrorlist_generate.html
templates/mirrors/mirrorlist_status.txt
templates/mirrors/mirrors.html
templates/mirrors/status.html
templates/news/add.html
templates/news/delete.html
templates/news/list.html
templates/news/view.html
templates/packages/details.html
templates/packages/differences.html
templates/packages/files.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/flaghelp.html
templates/packages/groups.html
templates/packages/opensearch.xml
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoff_options.html
templates/packages/signoffs.html
templates/packages/stale_relations.html
templates/public/about.html
templates/public/art.html
templates/public/blank.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/public/keys.html
templates/public/svn.html
templates/public/userlist.html
templates/registration/login.html
templates/registration/logout.html
templates/releng/add.html
templates/releng/results.html
templates/releng/thanks.html
templates/todolists/list.html
templates/todolists/public_list.html
templates/todolists/todolist_confirm_delete.html
templates/todolists/view.html
templates/visualize/index.html
todolists/views.py
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/management/commands/signoff_report.py | 3 | ||||
| -rw-r--r-- | packages/views/flag.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py index 70152cdb..498bb533 100644 --- a/packages/management/commands/signoff_report.py +++ b/packages/management/commands/signoff_report.py @@ -8,6 +8,7 @@ repository. Usage: ./manage.py signoff_report <email> <repository> """ +from django.conf import settings from django.core.mail import send_mail from django.core.urlresolvers import reverse from django.core.management.base import BaseCommand, CommandError @@ -120,7 +121,7 @@ def generate_report(email, repo_name): 'old_days': old_days, 'leaders': leaders, }) - from_addr = 'Parabola Website Notification <nobody@parabolagnulinux.org>' + from_addr = settings.BRANDING_EMAIL send_mail(subject, t.render(c), from_addr, [email]) # vim: set ts=4 sw=4 et: diff --git a/packages/views/flag.py b/packages/views/flag.py index 31eeda2d..760bdd94 100644 --- a/packages/views/flag.py +++ b/packages/views/flag.py @@ -98,7 +98,7 @@ def flag(request, name, repo, arch): }) send_mail(subject, tmpl.render(ctx), - 'Parabola Website Notification <nobody@parabolagnulinux.org>', + settings.BRANDING_EMAIL, toemail, fail_silently=True) |