From patchwork Thu May 17 21:54:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 8778 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4B9B023E1B for ; Thu, 17 May 2012 21:54:15 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 0737FA18361 for ; Thu, 17 May 2012 21:54:14 +0000 (UTC) Received: by yhpp61 with SMTP id p61so2813640yhp.11 for ; Thu, 17 May 2012 14:54:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=oOvPyVtbG7q2LCgG9mnvs/aIGoanzy7CejxE3j2/Bvw=; b=ViIpJB37VtsHmO/tgHplVndXVejN44UDiCbXjLFL3yDB1pKEHUYdMPwjq5Fpd0u+7Y DjvNLYfegevOwsvNbYGatIdzlvbqZ2/5hhqWX0jZoc3nNkkRL/s4yMXzV4hNAeMrHA1G zCYHoYZ8V0T4lGiv4OrIuoJxZ/ifm0FbRlVJ29tSPBucOubdSxd7Wq55WVpEstNYxiZM /Iy6PWLdpGtZgg1afmA5cdkK3n5qouOE6EZq/QvISQjQkaBtssmLZdP9jBb7iUA7vv7Y 5d70Vkv6KMl8wDvzYEhV/8+7yfl0jF4oGTKzWqB2rI8BM9Ke9/5JZGbNJjDso/hH/vaH iwjw== Received: by 10.50.222.202 with SMTP id qo10mr15168615igc.0.1337291654125; Thu, 17 May 2012 14:54:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.35.72 with SMTP id o8csp58769ibd; Thu, 17 May 2012 14:54:13 -0700 (PDT) Received: by 10.180.87.35 with SMTP id u3mr22028251wiz.11.1337291652566; Thu, 17 May 2012 14:54:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id l9si35471626wic.4.2012.05.17.14.54.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 May 2012 14:54:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SV8eB-0006bA-Eh for ; Thu, 17 May 2012 21:54:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 64C98E2146 for ; Thu, 17 May 2012 21:54:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 369 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 369: read SERVER_EMAIL from the settings.conf file Message-Id: <20120517215411.12286.79449.launchpad@ackee.canonical.com> Date: Thu, 17 May 2012 21:54:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15259"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 9f90588ab39a2f0c593a6a71b425cfe1bfcb3c11 X-Gm-Message-State: ALoCoQnGLjB3NWkqJvgRO+S6fjcgXaWQB6ZdQADJlF/29u5xbeo4PQUXDuXbBUf6vkzvKir0Y1go Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-server/set-SERVER_EMAIL/+merge/100908 proposed by: Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 369 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Fri 2012-05-18 09:50:10 +1200 message: read SERVER_EMAIL from the settings.conf file modified: lava_server/settings/debian.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_server/settings/debian.py' --- lava_server/settings/debian.py 2012-02-15 21:52:35 +0000 +++ lava_server/settings/debian.py 2012-04-05 04:28:45 +0000 @@ -74,5 +74,10 @@ # URL of the page you get redirected to after logging in LOGIN_REDIRECT_URL = debian_settings.LOGIN_REDIRECT_URL +# The email address that error messages come from, such as those sent to +# ADMINS and MANAGERS. +if debian_settings.get_setting("SERVER_EMAIL"): + SERVER_EMAIL = debian_settings.get_setting("SERVER_EMAIL") + # Load extensions loader.contribute_to_settings(locals(), debian_settings)