launchpad-dev team mailing list archive

[Martin Pool <mbp@xxxxxxxxxxxxx>]

Does anyone know why I get this rejection after proposing a merge?


---------- Forwarded message ----------
From:  <launchpad-bugs-owner@xxxxxxxxxxxxxxxxxxx>
Date: 13 May 2010 12:27
Subject: [Merge] lp:~mbp/launchpad/mbp-trivial into lp:launchpad/devel
To: mbp@xxxxxxxxxxxxxx


Your message was rejected



---------- Forwarded message ----------
From: Martin Pool <mbp@xxxxxxxxxxxxxx>
To: mp+25217@xxxxxxxxxxxxxxxxxx
Date: Thu, 13 May 2010 10:27:12 -0000
Subject: [Merge] lp:~mbp/launchpad/mbp-trivial into lp:launchpad/devel
Martin Pool has proposed merging lp:~mbp/launchpad/mbp-trivial into
lp:launchpad/devel.

Requested reviews:
 Canonical Launchpad Engineering (launchpad)


The way Launchpad tries to use your local smtp server from an EC2
instance is a bit strange; this makes it at least a bit more obvious.
--
https://code.launchpad.net/~mbp/launchpad/mbp-trivial/+merge/25217
Your team Canonical Launchpad Engineering is requested to review the
proposed merge of lp:~mbp/launchpad/mbp-trivial into
lp:launchpad/devel.

=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py        2010-04-28 11:37:02 +0000
+++ lib/devscripts/ec2test/testrunner.py        2010-05-13 10:27:11 +0000
@@ -289,12 +289,15 @@
        # Email configuration.
        if email is not None or pqm_message is not None:
            self._smtp_server = config.get_user_option('smtp_server')
+            # Refuse localhost, because there's no SMTP server _on the actual
+            # EC2 instance._
            if self._smtp_server is None or self._smtp_server == 'localhost':
                raise ValueError(
                    'To send email, a remotely accessible smtp_server (and '
                    'smtp_username and smtp_password, if necessary) must be '
                    'configured in bzr.  See the SMTP server information '
-                    'here: https://wiki.canonical.com/EmailSetup .')
+                    'here: https://wiki.canonical.com/EmailSetup .'
+                    'This server must be reachable from the EC2 instance.')
            self._smtp_username = config.get_user_option('smtp_username')
            self._smtp_password = config.get_user_option('smtp_password')
            self._from_email = config.username()





-- 
Martin <http://launchpad.net/~mbp/>

=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2010-04-28 11:37:02 +0000
+++ lib/devscripts/ec2test/testrunner.py	2010-05-13 10:27:11 +0000
@@ -289,12 +289,15 @@
         # Email configuration.
         if email is not None or pqm_message is not None:
             self._smtp_server = config.get_user_option('smtp_server')
+            # Refuse localhost, because there's no SMTP server _on the actual
+            # EC2 instance._
             if self._smtp_server is None or self._smtp_server == 'localhost':
                 raise ValueError(
                     'To send email, a remotely accessible smtp_server (and '
                     'smtp_username and smtp_password, if necessary) must be '
                     'configured in bzr.  See the SMTP server information '
-                    'here: https://wiki.canonical.com/EmailSetup .')
+                    'here: https://wiki.canonical.com/EmailSetup .'
+                    'This server must be reachable from the EC2 instance.')
             self._smtp_username = config.get_user_option('smtp_username')
             self._smtp_password = config.get_user_option('smtp_password')
             self._from_email = config.username()