mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-04-14 03:41:08 +00:00
* Update requestsync to send to Launchpad's MX record instead of hard
coding to the old MX (fiordland) * Recommend python-dns
This commit is contained in:
parent
8657394219
commit
f8f79ecf99
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,8 +1,14 @@
|
||||
ubuntu-dev-tools (0.115) UNRELEASED; urgency=low
|
||||
|
||||
[ Stefano Rivera ]
|
||||
* Catch DownloadErrors in ubuntutools.archive users. (LP: #708862)
|
||||
|
||||
-- Stefano Rivera <stefanor@ubuntu.com> Mon, 31 Jan 2011 18:54:28 +0200
|
||||
[ Scott Kitterman ]
|
||||
* Update requestsync to send to Launchpad's MX record instead of hard
|
||||
coding to the old MX (fiordland)
|
||||
* Recommend python-dns
|
||||
|
||||
-- Scott Kitterman <scott@kitterman.com> Mon, 31 Jan 2011 17:23:20 -0500
|
||||
|
||||
ubuntu-dev-tools (0.114) unstable; urgency=low
|
||||
|
||||
|
3
debian/control
vendored
3
debian/control
vendored
@ -55,7 +55,8 @@ Recommends: bzr,
|
||||
python-gnupginterface,
|
||||
python-magic,
|
||||
python-soappy,
|
||||
reportbug (>= 3.39ubuntu1)
|
||||
reportbug (>= 3.39ubuntu1),
|
||||
python-dns
|
||||
Suggests: debian-keyring,
|
||||
python-simplejson | python (>= 2.7),
|
||||
qemu-kvm-extras-static
|
||||
|
19
requestsync
19
requestsync
@ -95,9 +95,24 @@ def main():
|
||||
boolean=True)
|
||||
if options.lpinstance is None:
|
||||
options.lpinstance = config.get_value('LPINSTANCE')
|
||||
|
||||
|
||||
mailserver_host = config.get_value('SMTP_SERVER',
|
||||
default='fiordland.ubuntu.com',
|
||||
compat_keys=['UBUSMTP', 'DEBSMTP'])
|
||||
default='',
|
||||
compat_keys=['UBUSMTP', 'DEBSMTP'])
|
||||
if not mailserver_host:
|
||||
try:
|
||||
import DNS
|
||||
DNS.DiscoverNameServers()
|
||||
mxlist = DNS.mxlookup('launchpad.net')
|
||||
firstmx = mxlist[0]
|
||||
mx1host = firstmx[1]
|
||||
mailserver_host = config.get_value('SMTP_SERVER',
|
||||
default=mx1host,
|
||||
compat_keys=['UBUSMTP', 'DEBSMTP'])
|
||||
except ImportError, x:
|
||||
print "Please install python-dns to support Launchapd mail server lookup."
|
||||
|
||||
mailserver_port = config.get_value('SMTP_PORT', default=25,
|
||||
compat_keys=['UBUSMTP_PORT',
|
||||
'DEBSMTP_PORT'])
|
||||
|
Loading…
x
Reference in New Issue
Block a user