Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-06-05 21:11:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Update requestsync to send to Launchpad's MX record instead of hard

Browse Source 
coding to the old MX (fiordland)
  * Recommend python-dns
This commit is contained in:
Scott Kitterman 2011-01-31 18:37:23 -05:00
parent 8657394219
commit f8f79ecf99
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,8 +1,14 @@
ubuntu-dev-tools (0.115) UNRELEASED; urgency=low ubuntu-dev-tools (0.115) UNRELEASED; urgency=low
[ Stefano Rivera ]
* Catch DownloadErrors in ubuntutools.archive users. (LP: #708862) * 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 ubuntu-dev-tools (0.114) unstable; urgency=low

3
debian/control vendored
View File

@ -55,7 +55,8 @@ Recommends: bzr,
python-gnupginterface, python-gnupginterface,
python-magic, python-magic,
python-soappy, python-soappy,
reportbug (>= 3.39ubuntu1) reportbug (>= 3.39ubuntu1),
python-dns
Suggests: debian-keyring, Suggests: debian-keyring,
python-simplejson | python (>= 2.7), python-simplejson | python (>= 2.7),
qemu-kvm-extras-static qemu-kvm-extras-static

17
requestsync
View File

@ -95,9 +95,24 @@ def main():
boolean=True) boolean=True)
if options.lpinstance is None: if options.lpinstance is None:
options.lpinstance = config.get_value('LPINSTANCE') options.lpinstance = config.get_value('LPINSTANCE')
mailserver_host = config.get_value('SMTP_SERVER', mailserver_host = config.get_value('SMTP_SERVER',
default='fiordland.ubuntu.com', default='',
compat_keys=['UBUSMTP', 'DEBSMTP']) 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, mailserver_port = config.get_value('SMTP_PORT', default=25,
compat_keys=['UBUSMTP_PORT', compat_keys=['UBUSMTP_PORT',
'DEBSMTP_PORT']) 'DEBSMTP_PORT'])